adding gcp log compatibility and new status codes (#26)

Author: markterrill

.gitignore

@@ -3,4 +3,3 @@
 build
 build/***
 core-*
-

mos.yml

@@ -35,6 +35,7 @@ config_schema:
   - ["mqtt.max_queue_length", "i", 5, {title: "Maximum queue length for buffering QoS 1+ messages. 0 to disable queue."}]
   - ["mqtt.ws_enable", "b", false, {title: "Enable WebSocket encapsulation"}]
   - ["mqtt.ws_path", "s", "/mqtt", {title: "Path to use for WebSocket handshake"}]
+  - ["mqtt.debug_use_log_level", "b", false, {title: "Use the cs_log_level enum instead of stdout/stderr flag"}]
   # Alternative MQTT configuration. If enabled, client will alternate between mqtt and mqtt1
   # when unable to connect.
   - ["mqtt1", "mqtt", {title: "Backup MQTT settings"}]

src/mgos_mqtt.c

@@ -55,19 +55,28 @@ void mgos_mqtt_set_connect_fn(mgos_mqtt_connect_fn_t fn, void *fn_arg) {
 static void s_debug_write_cb(int ev, void *ev_data, void *userdata) {
   if (s_conn == NULL) return;
   struct mgos_debug_hook_arg *arg = (struct mgos_debug_hook_arg *) ev_data;
-  const char *topic =
-      (arg->fd == 1
-           ? mgos_sys_config_get_debug_stdout_topic()
-           : arg->fd == 2 ? mgos_sys_config_get_debug_stderr_topic() : NULL);
+  const char *topic = (arg->fd == 1   ? mgos_sys_config_get_debug_stdout_topic()
+                       : arg->fd == 2 ? mgos_sys_config_get_debug_stderr_topic()
+                                      : NULL);
   if (topic != NULL &&
       mgos_mqtt_num_unsent_bytes() < MGOS_MQTT_LOG_PUSHBACK_THRESHOLD) {
     static uint32_t s_seq = 0;
     char *msg = arg->buf;
+
+    int log_level = arg->fd;
+
+    if (mgos_sys_config_get_mqtt_debug_use_log_level()) {
+      log_level = (int) arg->level;  // ie LL_INFO
+      if (arg->fd == 2) {            // stderr
+        log_level = 0;               // LL_ERROR
+      }
+    }
+
     int msg_len = mg_asprintf(
         &msg, MGOS_DEBUG_TMP_BUF_SIZE, "%s %u %.3lf %d|%.*s",
         (mgos_sys_config_get_device_id() ? mgos_sys_config_get_device_id()
                                          : "-"),
-        (unsigned int) s_seq, mg_time(), arg->fd, (int) arg->len,
+        (unsigned int) s_seq, mg_time(), log_level, (int) arg->len,
         (const char *) arg->data);
     if (arg->len > 0) {
       mgos_mqtt_conn_pub(s_conn, topic, mg_mk_str_n(msg, msg_len), 0 /* qos */,

src/mgos_mqtt_conn.c

@@ -21,6 +21,7 @@
 
 #include "mgos.h"
 #include "mgos_debug.h"
+#include "mgos_event.h"
 #include "mgos_mongoose.h"
 
 static void mgos_mqtt_conn_net_ev(int ev, void *evd, void *arg);
@@ -186,7 +187,13 @@ void mgos_mqtt_ev(struct mg_connection *nc, int ev, void *ev_data,
       LOG(LL_INFO, ("MQTT%d %s connected %s (%d)", c->conn_id,
                     (cfg->ws_enable ? "WS" : "TCP"),
                     (status == 0 ? "ok" : "error"), status));
-      if (status != 0) break;
+      if (status != 0) {
+        if (cfg->cloud_events) {
+          struct mgos_cloud_arg arg = {.type = MGOS_CLOUD_MQTT};
+          mgos_event_trigger(MGOS_EVENT_CLOUD_CONNECTERROR, &arg);
+        }
+        break;
+      }
       struct mg_send_mqtt_handshake_opts opts;
       memset(&opts, 0, sizeof(opts));
       opts.user_name = cfg->user;