Skip to content

Commit

Permalink
Merge pull request #10 from marcosschroh/fix/logging
Browse files Browse the repository at this point in the history
fix/logging conf fixed.
  • Loading branch information
marcosschroh authored Apr 17, 2019
2 parents cbcbcbb + 8bf5c02 commit 0ea754a
Show file tree
Hide file tree
Showing 7 changed files with 21 additions and 12 deletions.
16 changes: 15 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,21 @@
# Changelog
All notable changes to rae-helm will be documented in this file.

## 2019-04-18
- Logging now is set from `settings` and not from ENV variable


## 2019-04-17
- Settings implemented with simple-settings package.
- Faust version updated to 1.5.4

## 2019-04-04
- Integration with Schema registry finished
- Custom Codec and Serializer added
- Schema Registry client added
- New faust application called Users added.

## 2019-03-17
- First release
- `docker-compose` finished with `zookeeper`, `kafka` and `schema-registry`
- `Page views` and `Leader Election` packages added.
- `Page views` and `Leader Election` packages added.
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ Useful ENVIRONMENT variables that you may change:
|--------|--------------|---------|
| WORKER | Entrypoint in setup.py | `example`|
| WORKER_PORT | Worker port | `6066` |
| WORKER_LOGLEVEL | Log level for the worker | `info`. |
| KAFKA_BOOSTRAP_SERVER | Kafka servers | `kafka://kafka:9092` |
| KAFKA_BOOSTRAP_SERVER_NAME | Kafka server name| `kafka` |
| KAFKA_BOOSTRAP_SERVER_PORT | Kafka server port | `9092` |
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ services:
environment:
- WORKER=example
- WORKER_PORT=6066
- WORKER_LOGLEVEL=info
- KAFKA_BOOTSTRAP_SERVER=kafka://kafka:9092
- KAFKA_BOOSTRAP_SERVER_NAME=kafka
- KAFKA_BOOSTRAP_SERVER_PORT=9092
Expand Down
5 changes: 1 addition & 4 deletions faust-project/example/codecs/avro.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,8 @@

from simple_settings import settings


SCHEMA_REGISTRY_URL = settings.SCHEMA_REGISTRY_URL

# Initialize Schema Registry Client
client = CachedSchemaRegistryClient(url=SCHEMA_REGISTRY_URL)
client = CachedSchemaRegistryClient(url=settings.SCHEMA_REGISTRY_URL)

avro_user_schema = SchemaFromJSONData({
"type": "record",
Expand Down
2 changes: 1 addition & 1 deletion faust-project/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ set -x

export SIMPLE_SETTINGS=settings

$WORKER worker -l $WORKER_LOGLEVEL --web-port=$WORKER_PORT
$WORKER worker --web-port=$WORKER_PORT
6 changes: 3 additions & 3 deletions faust-project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,15 +18,15 @@
},
'handlers': {
'console': {
'level': 'DEBUG',
'level': 'INFO',
'class': 'logging.StreamHandler',
'formatter': 'default',
},
},
'loggers': {
'': {
'example': {
'handlers': ['console'],
'level': 'DEBUG',
'level': 'INFO',
},
},
}
2 changes: 1 addition & 1 deletion faust-project/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

setup(
name='faust-example',
version='0.0.1',
version='1.1.1',
description='Faust example with Docker Compose',
long_description='''
Example running Faust with Docker Compose (zookeeper, kafka and schema-registry)
Expand Down

0 comments on commit 0ea754a

Please sign in to comment.