diff --git a/conf/settings.ini.dist b/conf/settings.ini.dist index 2ab1672..8fc6436 100644 --- a/conf/settings.ini.dist +++ b/conf/settings.ini.dist @@ -73,10 +73,6 @@ credentials = 'rest' ; This is the upper limit, you can set a different limit per room ;max_members = 0 -[log] -; Verbosity of the web interface. Can be debug, info, warn, error or fatal -;level = 'warn' - [etherpad] ; If you want to enabled etherpad-lite integratio, you must set ; the uri of your instance, and the API key @@ -94,5 +90,7 @@ credentials = 'rest' ; server backend. Can be either morbo (DEV) or hypnotoad (PROD) ; default is hypnotoad ;backend = 'hypnotoad' +; Log level of the daemon. Can be debug, info, warn, error or fatal +; log_level = 'warn' ; PID file, only used if backend is hypnotoad ;pid_file = '/tmp/vroom.pid' diff --git a/vroom.pl b/vroom.pl index bae959a..30776f5 100755 --- a/vroom.pl +++ b/vroom.pl @@ -55,17 +55,17 @@ $config->{'rooms.inactivity_timeout'} ||= 60; $config->{'rooms.reserved_inactivity_timeout'} ||= 86400; $config->{'rooms.common_names'} ||= ''; $config->{'rooms.max_members'} ||= 0; -$config->{'log.level'} ||= 'info'; $config->{'etherpad.uri'} ||= ''; $config->{'etherpad.api_key'} ||= ''; $config->{'etherpad.base_domain'} ||= ''; $config->{'daemon.listen_ip'} ||= '127.0.0.1'; $config->{'daemon.listen_port'} ||= '8090'; $config->{'daemon.backend'} ||= 'hypnotoad'; +$config->{'daemon.log_level'} ||= 'warn'; $config->{'daemon.pid_file'} ||= '/tmp/vroom.pid'; # Set log level -app->log->level($config->{'log.level'}); +app->log->level($config->{'daemon.log_level'}); # Create etherpad api client if required our $ec = undef;