diff --git a/helm/values.yaml b/helm/values.yaml index f13fa7c..10d757f 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -177,22 +177,9 @@ configProperties: openwifi.system.uri.ui: https://localhost openwifi.system.commandchannel: /tmp/app_owprov # Logging - logging.formatters.f1.class: PatternFormatter - logging.formatters.f1.pattern: "%Y-%m-%d %H:%M:%S %s: [%p] %t" - logging.formatters.f1.times: UTC - logging.channels.c1.class: ConsoleChannel - logging.channels.c1.formatter: f1 - logging.channels.c2.class: FileChannel - logging.channels.c2.path: /tmp/log_owprov - logging.channels.c2.formatter.class: PatternFormatter - logging.channels.c2.formatter.pattern: "%Y-%m-%d %H:%M:%S %s: [%p] %t" - logging.channels.c2.rotation: "20 M" - logging.channels.c2.archive: timestamp - logging.channels.c2.purgeCount: 20 - logging.channels.c3.class: ConsoleChannel - logging.channels.c3.pattern: "%s: [%p] %t" - logging.loggers.root.channel: c1 - logging.loggers.root.level: debug + logging.type: console + logging.path: $OWPROV_ROOT/logs + logging.level: debug # -> Secret part # REST API diff --git a/owprov.properties.tmpl b/owprov.properties.tmpl index 350b689..1ba1829 100644 --- a/owprov.properties.tmpl +++ b/owprov.properties.tmpl @@ -95,37 +95,6 @@ storage.type.mysql.connectiontimeout = 60 # Logging: please leave as is for now. # ######################################################################## -logging.formatters.f1.class = PatternFormatter -logging.formatters.f1.pattern = %Y-%m-%d %H:%M:%S %s: [%p] %t -logging.formatters.f1.times = UTC -logging.channels.c1.class = ConsoleChannel -logging.channels.c1.formatter = f1 - -# This is where the logs will be written. This path MUST exist -logging.channels.c2.class = FileChannel -logging.channels.c2.path = $OWPROV_ROOT/logs/log -logging.channels.c2.formatter.class = PatternFormatter -logging.channels.c2.formatter.pattern = %Y-%m-%d %H:%M:%S %s: [%p] %t -logging.channels.c2.rotation = 20 M -logging.channels.c2.archive = timestamp -logging.channels.c2.purgeCount = 20 -logging.channels.c3.class = ConsoleChannel -logging.channels.c3.pattern = %s: [%p] %t - -# External Channel -logging.loggers.root.channel = c1 -logging.loggers.root.level = debug - -# Inline Channel with PatternFormatter -# logging.loggers.l1.name = logger1 -# logging.loggers.l1.channel.class = ConsoleChannel -# logging.loggers.l1.channel.pattern = %s: [%p] %t -# logging.loggers.l1.level = information -# SplitterChannel -# logging.channels.splitter.class = SplitterChannel -# logging.channels.splitter.channels = l1,l2 -# logging.loggers.l2.name = logger2 -# logging.loggers.l2.channel = splitter - - - +logging.type = console +logging.path = $OWPROV_ROOT/logs +logging.level = debug