CORD-5285: Configure config files to use new logging module
Change-Id: Ia22b455c18790937fdb2be7d093951a192007ccf
diff --git a/README.md b/README.md
index ad63d6a..2404454 100644
--- a/README.md
+++ b/README.md
@@ -250,3 +250,4 @@
Roles should always have the same outcome, so avoid using conditionals or tags
to change the behavior of a role.
+
diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index 44e17b9..2409717 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -74,10 +74,6 @@
xos_db_name: xos
xos_db_username: postgres
xos_db_password: password
-xos_logging_level: debug
-xos_logging_channels:
- - file
- - console
xos_dir: /opt/xos
# GUI Config [new GUI], used in app.config.js.j2 and style.config.js.j2
diff --git a/roles/cord-profile/templates/xos_config.yaml.j2 b/roles/cord-profile/templates/xos_config.yaml.j2
index d05333c..7be1455 100644
--- a/roles/cord-profile/templates/xos_config.yaml.j2
+++ b/roles/cord-profile/templates/xos_config.yaml.j2
@@ -22,9 +22,19 @@
username: {{ xos_db_username }}
password: {{ xos_db_password }}
logging:
- level: {{ xos_logging_level }}
- channels:
-{% for channel in xos_logging_channels %}
- - {{ channel }}
-{% endfor %}
-xos_dir: {{ xos_dir }}
\ No newline at end of file
+ version: 1
+ handlers:
+ console:
+ class: logging.StreamHandler
+ file:
+ class: logging.handlers.RotatingFileHandler
+ filename: /var/log/xos.log
+ maxBytes: 10485760
+ backupCount: 5
+ loggers:
+ '':
+ handlers:
+ - console
+ - file
+ level: DEBUG
+xos_dir: {{ xos_dir }}
diff --git a/roles/cord-profile/templates/xos_config_synchronizer.yaml.j2 b/roles/cord-profile/templates/xos_config_synchronizer.yaml.j2
index d3f7d2f..89c3d8c 100644
--- a/roles/cord-profile/templates/xos_config_synchronizer.yaml.j2
+++ b/roles/cord-profile/templates/xos_config_synchronizer.yaml.j2
@@ -23,11 +23,18 @@
endpoint: "xos-core.{{ site_suffix }}:50051"
logging:
- file: '/var/log/xos_synchronizer.log'
- logstash_hostport: 'cordloghost.{{ site_suffix }}:5617'
- level: {{ xos_logging_level }}
- channels:
-{% for channel in xos_logging_channels %}
- - {{ channel }}
-{% endfor %}
-
+ version: 1
+ handlers:
+ console:
+ class: logging.StreamHandler
+ file:
+ class: logging.handlers.RotatingFileHandler
+ filename: /var/log/xos.log
+ maxBytes: 10485760
+ backupCount: 5
+ loggers:
+ '':
+ handlers:
+ - console
+ - file
+ level: DEBUG