Change log levels

Some of them were set incorrectly, e.g. something that caused the
daemon to exit was marked as just a warning, instead of an error.

Removed debug level as it was hard to decide whether something should
go into info or debug. This is mostly because the use of the debug level
wasn't well defined. Debug should be used for information that could
help a user to debug an issue, but messages marked as debug were by the
most part the "success" log messages, which could go into info level
instead.

1 files changed, 29 insertions, 29 deletions

diff --git a/other/bootstrap_daemon/tox-bootstrapd.c b/other/bootstrap_daemon/tox-bootstrapd.c
index 267e7238..71b1386d 100644
--- a/other/bootstrap_daemon/tox-bootstrapd.c
+++ b/other/bootstrap_daemon/tox-bootstrapd.c
@@ -144,7 +144,7 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
         int i;
 
         for (i = 0; i < DEFAULT_TCP_RELAY_PORTS_COUNT; i ++) {
-            syslog(LOG_WARNING, "Port #%d: %u\n", i, default_ports[i]);
+            syslog(LOG_INFO, "Port #%d: %u\n", i, default_ports[i]);
         }
 
         // similar procedure to the one of reading config file below
@@ -176,7 +176,7 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
     }
 
     if (config_setting_is_array(ports_array) == CONFIG_FALSE) {
-        syslog(LOG_WARNING, "'%s' setting should be an array. Array syntax: 'setting = [value1, value2, ...]'.\n",
+        syslog(LOG_ERR, "'%s' setting should be an array. Array syntax: 'setting = [value1, value2, ...]'.\n",
                NAME_TCP_RELAY_PORTS);
         return;
     }
@@ -184,7 +184,7 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
     int config_port_count = config_setting_length(ports_array);
 
     if (config_port_count == 0) {
-        syslog(LOG_WARNING, "'%s' is empty.\n", NAME_TCP_RELAY_PORTS);
+        syslog(LOG_ERR, "'%s' is empty.\n", NAME_TCP_RELAY_PORTS);
         return;
     }
 
@@ -357,34 +357,34 @@ int get_general_config(const char *cfg_file_path, char **pid_file_path, char **k
 
     config_destroy(&cfg);
 
-    syslog(LOG_DEBUG, "Successfully read:\n");
-    syslog(LOG_DEBUG, "'%s': %s\n", NAME_PID_FILE_PATH,        *pid_file_path);
-    syslog(LOG_DEBUG, "'%s': %s\n", NAME_KEYS_FILE_PATH,       *keys_file_path);
-    syslog(LOG_DEBUG, "'%s': %d\n", NAME_PORT,                 *port);
-    syslog(LOG_DEBUG, "'%s': %s\n", NAME_ENABLE_IPV6,          *enable_ipv6          ? "true" : "false");
-    syslog(LOG_DEBUG, "'%s': %s\n", NAME_ENABLE_IPV4_FALLBACK, *enable_ipv4_fallback ? "true" : "false");
-    syslog(LOG_DEBUG, "'%s': %s\n", NAME_ENABLE_LAN_DISCOVERY, *enable_lan_discovery ? "true" : "false");
+    syslog(LOG_INFO, "Successfully read:\n");
+    syslog(LOG_INFO, "'%s': %s\n", NAME_PID_FILE_PATH,        *pid_file_path);
+    syslog(LOG_INFO, "'%s': %s\n", NAME_KEYS_FILE_PATH,       *keys_file_path);
+    syslog(LOG_INFO, "'%s': %d\n", NAME_PORT,                 *port);
+    syslog(LOG_INFO, "'%s': %s\n", NAME_ENABLE_IPV6,          *enable_ipv6          ? "true" : "false");
+    syslog(LOG_INFO, "'%s': %s\n", NAME_ENABLE_IPV4_FALLBACK, *enable_ipv4_fallback ? "true" : "false");
+    syslog(LOG_INFO, "'%s': %s\n", NAME_ENABLE_LAN_DISCOVERY, *enable_lan_discovery ? "true" : "false");
 
-    syslog(LOG_DEBUG, "'%s': %s\n", NAME_ENABLE_TCP_RELAY,     *enable_tcp_relay     ? "true" : "false");
+    syslog(LOG_INFO, "'%s': %s\n", NAME_ENABLE_TCP_RELAY,     *enable_tcp_relay     ? "true" : "false");
 
     // show info about tcp ports only if tcp relay is enabled
     if (*enable_tcp_relay) {
         if (*tcp_relay_port_count == 0) {
-            syslog(LOG_DEBUG, "No TCP ports could be read.\n");
+            syslog(LOG_ERR, "No TCP ports could be read.\n");
         } else {
-            syslog(LOG_DEBUG, "Read %d TCP ports:\n", *tcp_relay_port_count);
+            syslog(LOG_INFO, "Read %d TCP ports:\n", *tcp_relay_port_count);
             int i;
 
             for (i = 0; i < *tcp_relay_port_count; i ++) {
-                syslog(LOG_DEBUG, "Port #%d: %u\n", i, (*tcp_relay_ports)[i]);
+                syslog(LOG_INFO, "Port #%d: %u\n", i, (*tcp_relay_ports)[i]);
             }
         }
     }
 
-    syslog(LOG_DEBUG, "'%s': %s\n", NAME_ENABLE_MOTD,          *enable_motd          ? "true" : "false");
+    syslog(LOG_INFO, "'%s': %s\n", NAME_ENABLE_MOTD,          *enable_motd          ? "true" : "false");
 
     if (*enable_motd) {
-        syslog(LOG_DEBUG, "'%s': %s\n", NAME_MOTD, *motd);
+        syslog(LOG_INFO, "'%s': %s\n", NAME_MOTD, *motd);
     }
 
     return 1;
@@ -483,7 +483,7 @@ int bootstrap_from_config(const char *cfg_file_path, DHT *dht, int enable_ipv6)
             goto next;
         }
 
-        syslog(LOG_DEBUG, "Successfully added bootstrap node #%d: %s:%d %s\n", i, bs_address, bs_port, bs_public_key);
+        syslog(LOG_INFO, "Successfully added bootstrap node #%d: %s:%d %s\n", i, bs_address, bs_port, bs_public_key);
 
 next:
         // config_setting_lookup_string() allocates string inside and doesn't allow us to free it direcly
@@ -541,7 +541,7 @@ int main(int argc, char *argv[])
 
     if (get_general_config(cfg_file_path, &pid_file_path, &keys_file_path, &port, &enable_ipv6, &enable_ipv4_fallback,
                            &enable_lan_discovery, &enable_tcp_relay, &tcp_relay_ports, &tcp_relay_port_count, &enable_motd, &motd)) {
-        syslog(LOG_DEBUG, "General config read successfully\n");
+        syslog(LOG_INFO, "General config read successfully\n");
     } else {
         syslog(LOG_ERR, "Couldn't read config file: %s. Exiting.\n", cfg_file_path);
         return 1;
@@ -556,7 +556,7 @@ int main(int argc, char *argv[])
     FILE *pid_file;
 
     if ((pid_file = fopen(pid_file_path, "r"))) {
-        syslog(LOG_ERR, "Another instance of the daemon is already running, PID file %s exists.\n", pid_file_path);
+        syslog(LOG_WARNING, "Another instance of the daemon is already running, PID file %s exists.\n", pid_file_path);
         fclose(pid_file);
     }
 
@@ -567,17 +567,17 @@ int main(int argc, char *argv[])
 
     if (net == NULL) {
         if (enable_ipv6 && enable_ipv4_fallback) {
-            syslog(LOG_DEBUG, "Couldn't initialize IPv6 networking. Falling back to using IPv4.\n");
+            syslog(LOG_WARNING, "Couldn't initialize IPv6 networking. Falling back to using IPv4.\n");
             enable_ipv6 = 0;
             ip_init(&ip, enable_ipv6);
             net = new_networking(ip, port);
 
             if (net == NULL) {
-                syslog(LOG_DEBUG, "Couldn't fallback to IPv4. Exiting.\n");
+                syslog(LOG_ERR, "Couldn't fallback to IPv4. Exiting.\n");
                 return 1;
             }
         } else {
-            syslog(LOG_DEBUG, "Couldn't initialize networking. Exiting.\n");
+            syslog(LOG_ERR, "Couldn't initialize networking. Exiting.\n");
             return 1;
         }
     }
@@ -600,7 +600,7 @@ int main(int argc, char *argv[])
 
     if (enable_motd) {
         if (bootstrap_set_callbacks(dht->net, DAEMON_VERSION_NUMBER, (uint8_t *)motd, strlen(motd) + 1) == 0) {
-            syslog(LOG_DEBUG, "Set MOTD successfully.\n");
+            syslog(LOG_INFO, "Set MOTD successfully.\n");
         } else {
             syslog(LOG_ERR, "Couldn't set MOTD: %s. Exiting.\n", motd);
             return 1;
@@ -610,7 +610,7 @@ int main(int argc, char *argv[])
     }
 
     if (manage_keys(dht, keys_file_path)) {
-        syslog(LOG_DEBUG, "Keys are managed successfully.\n");
+        syslog(LOG_INFO, "Keys are managed successfully.\n");
     } else {
         syslog(LOG_ERR, "Couldn't read/write: %s. Exiting.\n", keys_file_path);
         return 1;
@@ -630,7 +630,7 @@ int main(int argc, char *argv[])
         free(tcp_relay_ports);
 
         if (tcp_server != NULL) {
-            syslog(LOG_DEBUG, "Initialized Tox TCP server successfully.\n");
+            syslog(LOG_INFO, "Initialized Tox TCP server successfully.\n");
         } else {
             syslog(LOG_ERR, "Couldn't initialize Tox TCP server. Exiting.\n");
             return 1;
@@ -638,7 +638,7 @@ int main(int argc, char *argv[])
     }
 
     if (bootstrap_from_config(cfg_file_path, dht, enable_ipv6)) {
-        syslog(LOG_DEBUG, "List of bootstrap nodes read successfully.\n");
+        syslog(LOG_INFO, "List of bootstrap nodes read successfully.\n");
     } else {
         syslog(LOG_ERR, "Couldn't read list of bootstrap nodes in %s. Exiting.\n", cfg_file_path);
         return 1;
@@ -663,7 +663,7 @@ int main(int argc, char *argv[])
     if (pid > 0) {
         fprintf(pidf, "%d", pid);
         fclose(pidf);
-        syslog(LOG_DEBUG, "Forked successfully: PID: %d.\n", pid);
+        syslog(LOG_INFO, "Forked successfully: PID: %d.\n", pid);
         return 0;
     } else {
         fclose(pidf);
@@ -701,7 +701,7 @@ int main(int argc, char *argv[])
 
     if (enable_lan_discovery) {
         LANdiscovery_init(dht);
-        syslog(LOG_DEBUG, "Initialized LAN discovery.\n");
+        syslog(LOG_INFO, "Initialized LAN discovery.\n");
     }
 
     while (1) {
@@ -719,7 +719,7 @@ int main(int argc, char *argv[])
         networking_poll(dht->net);
 
         if (waiting_for_dht_connection && DHT_isconnected(dht)) {
-            syslog(LOG_DEBUG, "Connected to other bootstrap node successfully.\n");
+            syslog(LOG_INFO, "Connected to other bootstrap node successfully.\n");
             waiting_for_dht_connection = 0;
         }