sources/instance.c: Move logger changes from config (#794)

* sources/instance.c: Move logger changes from config

There is a bug: when odyssey starts with invalid path to log file, it crashes without message.

This commit fix this problem and adds test to check it works correctly.

Signed-off-by: Vikmalakhov <[email protected]>

* docker/invalid_log_file: log_path -> invalid_log_file

Signed-off-by: Vikmalakhov <[email protected]>

---------

Signed-off-by: Vikmalakhov <[email protected]>

Author: Varman56

docker/Dockerfile

@@ -116,6 +116,7 @@ COPY ./docker/copy /copy
 COPY ./docker/gorm /gorm
 COPY ./docker/reload /reload
 COPY ./docker/tls-compat /tls-compat
+COPY ./docker/invalid_log_file /invalid_log_file
 
 COPY ./third_party/machinarium/gdb/machinarium-gdb.py /gdb.py
 

docker/entrypoint.sh

@@ -10,6 +10,13 @@ ody-stop
 
 setup
 
+# path to log file
+/invalid_log_file/test_log_file.sh
+if [ $? -eq 1 ]
+then
+	exit 1
+fi
+
 /tls-compat/test-tls-compat.sh
 if [ $? -eq 1 ]
 then

docker/invalid_log_file/config.conf

@@ -0,0 +1,54 @@
+
+storage "postgres_server" {
+	type "remote"
+	
+    host "localhost"
+	port 5432
+}
+
+database default {
+	user default {
+		authentication "none"
+		storage "postgres_server"
+		pool "session"
+		client_fwd_error yes
+	}
+}
+
+unix_socket_dir "/tmp"
+unix_socket_mode "0644"
+
+
+log_format "%p %t %l [%i %s] (%c) %m\n"
+log_file "/hgdfgf/juyhgfd/invalid.log"
+log_to_stdout no
+
+daemonize no
+
+locks_dir "/tmp/odyssey"
+graceful_die_on_errors yes
+enable_online_restart yes
+bindwith_reuseport yes
+
+stats_interval 60
+
+pid_file "/var/run/odyssey.pid"
+
+listen {
+	host "*"
+	port 6432
+}
+
+
+storage "local" {
+	type "local"
+}
+
+database "console" {
+	user default {
+		authentication "none"
+		role "admin"
+		pool "session"
+		storage "local"
+	}
+}

docker/invalid_log_file/test_log_file.sh

@@ -0,0 +1,9 @@
+#!/bin/bash -x
+
+set -ex
+if ! /usr/bin/odyssey /invalid_log_file/config.conf | grep -q "failed to open log file "; then 
+	echo "ERROR: can't find log open error in stdout"
+    exit 1
+fi
+
+ody-stop

sources/instance.c

@@ -227,11 +227,6 @@ int od_instance_main(od_instance_t *instance, int argc, char **argv)
 		goto error;
 	}
 
-	/* configure logger */
-	od_logger_set_format(&instance->logger, instance->config.log_format);
-	od_logger_set_debug(&instance->logger, instance->config.log_debug);
-	od_logger_set_stdout(&instance->logger, instance->config.log_to_stdout);
-
 	/* run as daemon */
 	if (instance->config.daemonize) {
 		rc = od_daemonize();
@@ -254,6 +249,11 @@ int od_instance_main(od_instance_t *instance, int argc, char **argv)
 		}
 	}
 
+	/* configure logger */
+	od_logger_set_format(&instance->logger, instance->config.log_format);
+	od_logger_set_debug(&instance->logger, instance->config.log_debug);
+	od_logger_set_stdout(&instance->logger, instance->config.log_to_stdout);
+
 	/* syslog */
 	if (instance->config.log_syslog) {
 		od_logger_open_syslog(&instance->logger,