Renamed CRITICAL log-level to FATAL

Author: codepr

src/handlers.c

@@ -372,7 +372,7 @@ static int connect_handler(struct io_event *e) {
         // TODO check for will_topic != NULL
         struct topic *t = topic_get_or_create(&server, will_topic);
         if (!t)
-            log_critical("connect_handler failed: Out of memory");
+            log_fatal("connect_handler failed: Out of memory");
         if (!topic_exists(&server, t->name))
             topic_put(&server, t);
         // I'm sure that the string will be NUL terminated by unpack function
@@ -391,15 +391,15 @@ static int connect_handler(struct io_event *e) {
         };
 
         if (!cc->session->lwt_msg.publish.topic || !cc->session->lwt_msg.publish.payload)
-            log_critical("connect_handler failed: Out of memory");
+            log_fatal("connect_handler failed: Out of memory");
 
         cc->session->lwt_msg.header.bits.qos = c->bits.will_qos;
         // We must store the retained message in the topic
         if (c->bits.will_retain == 1) {
             size_t publen = mqtt_size(&cc->session->lwt_msg, NULL);
             unsigned char *payload = xmalloc(publen);
             if (!payload)
-                log_critical("connect_handler failed: Out of memory")
+                log_fatal("connect_handler failed: Out of memory")
             mqtt_pack(&cc->session->lwt_msg, payload);
             // We got a ready-to-be-sent bytestring in the retained message
             // field
@@ -449,11 +449,11 @@ static inline void add_wildcard(const char *topic, struct subscriber *s,
                                 bool wildcard) {
     struct subscription *subscription = xmalloc(sizeof(*subscription));
     if (!subscription)
-        log_critical("add_wildcard failed: Out of memory");
+        log_fatal("add_wildcard failed: Out of memory");
     subscription->subscriber = s;
     subscription->topic = xstrdup(topic);
     if (!subscription->topic)
-        log_critical("add_wildcard failed: Out of memory");
+        log_fatal("add_wildcard failed: Out of memory");
     subscription->multilevel = wildcard;
     INCREF(s, struct subscriber);
     server.wildcards = list_push(server.wildcards, subscription);
@@ -516,7 +516,7 @@ static int subscribe_handler(struct io_event *e) {
 
         struct topic *t = topic_get_or_create(&server, topic);
         if (!t)
-            log_critical("subscribe_handler failed: Out of memory");
+            log_fatal("subscribe_handler failed: Out of memory");
         /*
          * Let's explore two possible scenarios:
          * 1. Normal topic (no single level wildcard '+') which can end with
@@ -666,7 +666,7 @@ static int publish_handler(struct io_event *e) {
      */
     struct topic *t = topic_get_or_create(&server, topic);
     if (!t)
-        log_critical("publish_handler failed: Out of memory");
+        log_fatal("publish_handler failed: Out of memory");
 
     /* Check for # wildcards subscriptions */
     if (list_size(server.wildcards) > 0) {
@@ -697,7 +697,7 @@ static int publish_handler(struct io_event *e) {
     if (hdr->bits.retain == 1) {
         t->retained_msg = xmalloc(mqtt_size(&e->data, NULL));
         if (!t->retained_msg)
-            log_critical("publish_handler failed: Out of memory");
+            log_fatal("publish_handler failed: Out of memory");
         mqtt_pack(&e->data, t->retained_msg);
     }
 #if THREADSNR > 0

src/server.c

@@ -396,13 +396,13 @@ static void client_init(struct client *client) {
     if (!client->rbuf)
         client->rbuf = xcalloc(conf->max_request_size, sizeof(unsigned char));
     if (!client->rbuf)
-        log_critical("client_init failed: Out of memory");
+        log_fatal("client_init failed: Out of memory");
     client->wrote = ATOMIC_VAR_INIT(0);
     client->towrite = ATOMIC_VAR_INIT(0);
     if (!client->wbuf)
         client->wbuf = xcalloc(conf->max_request_size, sizeof(unsigned char));
     if (!client->wbuf)
-        log_critical("client_init failed: Out of memory");
+        log_fatal("client_init failed: Out of memory");
     client->last_seen = time(NULL);
     client->has_lwt = false;
     client->session = NULL;
@@ -980,7 +980,7 @@ int start_server(const char *addr, const char *port) {
     for (int i = 0; i < SYS_TOPICS; i++) {
         struct topic *t = topic_new(xstrdup(sys_topics[i].name));
         if (!t)
-            log_critical("start_server failed: Out of memory");
+            log_fatal("start_server failed: Out of memory");
         topic_put(&server, t);
     }
 
@@ -1102,10 +1102,10 @@ void session_init(struct client_session *session, const char *session_id) {
     snprintf(session->session_id, MQTT_CLIENT_ID_LEN, "%s", session_id);
     session->i_acks = xcalloc(MAX_INFLIGHT_MSGS, sizeof(time_t));
     if (!session->i_acks)
-        log_critical("session_init failed: Out of memory");
+        log_fatal("session_init failed: Out of memory");
     session->i_msgs = xcalloc(MAX_INFLIGHT_MSGS, sizeof(struct inflight_msg));
     if (!session->i_msgs)
-        log_critical("session_init failed: Out of memory");
+        log_fatal("session_init failed: Out of memory");
     session->refcount = (struct ref) { session_free, 0 };
 }
 

src/util.h

@@ -37,7 +37,7 @@
 
 #define SOL_PREFIX   "sol"
 
-enum log_level { DEBUG, INFORMATION, WARNING, ERROR, CRITICAL };
+enum log_level { DEBUG, INFORMATION, WARNING, ERROR, FATAL };
 
 bool is_integer(const char *);
 int parse_int(const char *);
@@ -70,8 +70,8 @@ long get_fh_soft_limit(void);
 #define log_warning(...) log(WARNING, __VA_ARGS__)
 #define log_error(...) log(ERROR, __VA_ARGS__)
 #define log_info(...) log(INFORMATION, __VA_ARGS__)
-#define log_critical(...) do {      \
-    log(CRITICAL, __VA_ARGS__);     \
+#define log_fatal(...) do {      \
+    log(FATAL, __VA_ARGS__);     \
     exit(EXIT_FAILURE);             \
 } while(0);