Changeset 3509 in MondoRescue for branches/3.2/mondo/src/lib/mr_msg.c

Timestamp:

Feb 13, 2016, 2:57:55 AM (8 years ago)

Author:

Bruno Cornec

Message:

• Change mr_msg_int interface by adding the FUNCTION macro
• Use mr_msg in mr_system
• Ability to use that new log system everywhere now

File:

• branches/3.2/mondo/src/lib/mr_msg.c (modified) (5 diffs)

branches/3.2/mondo/src/lib/mr_msg.c

@@ -19 +19 @@
 static int mr_loglevel = 0;
 static char *mr_logfile = NULL;
+static FILE *mr_flog = NULL;
 
 /*
@@ -24 +25 @@
  * It should not depend on any other function of the mr lib 
  */
-
-/* Cleanup function for messages */
-void mr_msg_close(void) {
-    free(mr_logfile);
-    mr_logfile = NULL;
-    mr_loglevel = 0;
-}
 
 /* Function allowing to change loglevel after init */
@@ -38 +32 @@
 }
 
+/* Cleanup function for messages */
+void mr_msg_close(void) {
+
+    int res = 0;
+    if ((res = fclose(mr_flog)) != 0) {
+        fprintf(stderr,"Unable to close %s\n",mr_logfile);
+    }
+    free(mr_logfile);
+
+    mr_logfile = NULL;
+    mr_loglevel = 0;
+    mr_flog = NULL;
+return;
+}
+
 /* Initialization function for messages */
 void mr_msg_init(const char *logfile, int loglevel) {
-    FILE *fout = NULL;
-    int res = 0;
-
     if (asprintf(&mr_logfile, "%s", logfile) == -1) {
         fprintf(stderr,"Unable to alloc memory\n");
@@ -48 +54 @@
         mr_msg_close();
     }
-    if ((fout = fopen(mr_logfile, "w")) == NULL) {
-        fprintf(stderr,"Unable to write to %s\n",mr_logfile);
-        fprintf(stderr,"Logging desactivated\n");
-        mr_msg_close();
-    }
-    if ((res = fclose(fout)) != 0) {
-        fprintf(stderr,"Unable to close %s\n",mr_logfile);
+    if (fopen(mr_logfile, "r") == NULL) {
+        /*  log file doesn't exist yet, so creating it */
+        if ((mr_flog = fopen(mr_logfile, "w")) == NULL) {
+            fprintf(stderr,"Unable to write to %s\n",mr_logfile);
+            fprintf(stderr,"Logging desactivated\n");
+            mr_msg_close();
+        }
+    } else {
+        /*  If it exists try to append to it */
+        if ((mr_flog = fopen(mr_logfile, "a")) == NULL) {
+            fprintf(stderr,"Unable to write to %s\n",mr_logfile);
+            fprintf(stderr,"Logging desactivated\n");
+            mr_msg_close();
+        }
     }
     mr_msg_loglevel(loglevel);
@@ -63 +76 @@
  * but through other functions
  * fmt needs to be just before ...
- * debug should be >0 to have file and line printed (real debug)
+ * level should be >0 to have file and line printed (real debug)
  * If =0 it's an informative log message
  */
-void mr_msg_int(int debug, int line, const char *file, const char *fmt, ...) {
+void mr_msg_int(int level, int line, const char *file, char *function, const char *fmt, ...) {
 
-    int i = 0;
-    int res = 0;
-    FILE *fout = NULL;
     va_list args;
 
-    if (mr_logfile == NULL) {
+    if ((mr_logfile == NULL) || (mr_flog == NULL)) {
         return;
     }
 
-    if (debug <= mr_loglevel) {
-        if ((fout = fopen(mr_logfile, "a")) == NULL) {
-            fprintf(stderr,"Unable to append to %s\n",mr_logfile);
-            return;
-        }
-
-        // add 2 spaces to distinguish log levels
-        if (debug > 0) {
-            for (i = 1; i < debug; i++)
-                fprintf(fout, "  ");
-            fprintf(fout, "%s #%d: ", file, line);
+    if (level <= mr_loglevel) {
+        if (level > 0) {
+            fprintf(mr_flog, "DBG%d: ", level);
+            fprintf(mr_flog, "%s->%s#%d: ", file, function, line);
+        } else {
+            fprintf(mr_flog, "INFO: ");
         }
         va_start(args,fmt);
-        if (vfprintf(fout, fmt, args) < 0) {
+        if (vfprintf(mr_flog, fmt, args) < 0) {
             fprintf(stderr,"Unable to print to %s\n",mr_logfile);
         }
-        fprintf(fout,"\n");
+        fprintf(mr_flog,"\n");
         va_end(args);
 
-        if ((res = fclose(fout)) != 0) {
-            fprintf(stderr,"Unable to close %s\n",mr_logfile);
-        }
     }
+    return;
 }
+