Changeset 1571 in MondoRescue

Timestamp:

Jul 26, 2007, 2:12:40 AM (18 years ago)

Author:

Bruno Cornec

Message:

• Improve mr_conf functions loging with conf file filename printed
• MINDI_CONF_DIR depends on MONDO_CONF_DIR (just a bit better)

Location:

branches/stable/mondo/src

Files:

• common/libmondo-archive.c (modified) (1 diff)
• lib/mr_conf.c (modified) (4 diffs)
• mondoarchive/mondoarchive.c (modified) (1 diff)

branches/stable/mondo/src/common/libmondo-archive.c

@@ -1891 +1891 @@
         mr_asprintf(&message_to_screen, "Running %s to make %s #%d",
                 mr_conf->iso_creation_cmd,
-                 bkpinfo->backup_media_string,
-                 g_current_media_number);
+                bkpinfo->backup_media_string,
+                g_current_media_number);
         mr_msg(1, message_to_screen);
         mr_asprintf(&result_sz, "Call to %s to make ISO (%s #%d) ",
                 mr_conf->iso_creation_cmd,
-                 bkpinfo->backup_media_string,
-                 g_current_media_number);
+                bkpinfo->backup_media_string,
+                g_current_media_number);
         if (bkpinfo->nonbootable_backup) {
             mr_msg(1, "Making nonbootable backup");

branches/stable/mondo/src/lib/mr_conf.c

@@ -80 +80 @@
 static int internal_flags = 0;  /*state of the module */
 static FILE *CONF = NULL;       /* Configuration file FD */
+static char *mr_conf_filename = NULL;   /* Configuration filename */
 
 /*if output all error and warning messages*/
@@ -108 +109 @@
     CONF = fopen(filename, "r");
 
+    mr_asprintf(&mr_conf_filename,filename);
+
     /*if file is empty or not exist => error */
     if (length == 0) {
@@ -146 +149 @@
     mr_free(buffer);
     fclose(CONF);
+
+    mr_free(mr_conf_filename);
 
     /*set flag that module is in "close" state */
@@ -389 +394 @@
         switch (error_code) {
         case MRCONF_BAD_FILE:
-            mr_msg_int(1,line,file,"%s %s %s", MRCONF_STR_ERROR, MRCONF_STR_BAD_FILE,
+            mr_msg_int(1,line,file,"%s (%s) %s %s", MRCONF_STR_ERROR, mr_conf_filename, MRCONF_STR_BAD_FILE,
                    add_line);
             break;
 
         case MRCONF_READING_FAILED:
-            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_ERROR, MRCONF_STR_READING_FAILED);
+            mr_msg_int(1,line,file,"%s (%s) %s", MRCONF_STR_ERROR, mr_conf_filename, MRCONF_STR_READING_FAILED);
             break;
 
         case MRCONF_FIELD_NOT_FOUND:
-            mr_msg_int(1,line,file,"%s %s \"%s\"", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NOT_FOUND, add_line);
-            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_WARNING, MRCONF_STR_SET_TO_ZERO);
+            mr_msg_int(1,line,file,"%s (%s) %s \"%s\"", MRCONF_STR_ERROR, mr_conf_filename, MRCONF_STR_FIELD_NOT_FOUND, add_line);
+            mr_msg_int(1,line,file,"%s (%s) %s", MRCONF_STR_WARNING, mr_conf_filename, MRCONF_STR_SET_TO_ZERO);
             break;
 
         case MRCONF_FIELD_NO_VALUE:
-            mr_msg_int(1,line,file,"%s %s \"%s\"", MRCONF_STR_ERROR, MRCONF_STR_FIELD_NO_VALUE, add_line);
-            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_WARNING, MRCONF_STR_IGNORE);
+            mr_msg_int(1,line,file,"%s (%s) %s \"%s\"", MRCONF_STR_ERROR, mr_conf_filename, MRCONF_STR_FIELD_NO_VALUE, add_line);
+            mr_msg_int(1,line,file,"%s (%s) %s", MRCONF_STR_WARNING, mr_conf_filename, MRCONF_STR_IGNORE);
             break;
 
         case MRCONF_CLOSE_BUT_NOT_OPEN:
-            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_WARNING, MRCONF_STR_CLOSE_BUT_NOT_OPEN);
+            mr_msg_int(1,line,file,"%s (%s) %s", MRCONF_STR_WARNING, mr_conf_filename, MRCONF_STR_CLOSE_BUT_NOT_OPEN);
             break;
 
         case MRCONF_CALL_BUT_NOT_OPEN:
-            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_WARNING, MRCONF_STR_CALL_BUT_NOT_OPEN);
+            mr_msg_int(1,line,file,"%s (%s) %s", MRCONF_STR_WARNING, mr_conf_filename, MRCONF_STR_CALL_BUT_NOT_OPEN);
             break;
 
         case MRCONF_OPEN_OPENED:
-            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_ERROR, MRCONF_STR_OPEN_OPENED);
+            mr_msg_int(1,line,file,"%s (%s) %s", MRCONF_STR_ERROR, mr_conf_filename, MRCONF_STR_OPEN_OPENED);
             break;
 
         case MRCONF_STRING_QUOTE:
-            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_ERROR, MRCONF_STR_STRING_QUOTE);
+            mr_msg_int(1,line,file,"%s (%s) %s", MRCONF_STR_ERROR, mr_conf_filename, MRCONF_STR_STRING_QUOTE);
             break;
 
         case MRCONF_STRING_ENDQUOTE:
-            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_ERROR, MRCONF_STR_STRING_ENDQUOTE);
+            mr_msg_int(1,line,file,"%s (%s) %s", MRCONF_STR_ERROR, mr_conf_filename, MRCONF_STR_STRING_ENDQUOTE);
             break;
 
         default:
-            mr_msg_int(1,line,file,"%s %s", MRCONF_STR_ERROR, MRCONF_STR_DEFAULT_ERROR);
-            break;
-        }
-    }
-}
+            mr_msg_int(1,line,file,"%s (%s) %s", MRCONF_STR_ERROR, mr_conf_filename, MRCONF_STR_DEFAULT_ERROR);
+            break;
+        }
+    }
+}

branches/stable/mondo/src/mondoarchive/mondoarchive.c

@@ -344 +344 @@
     /* Get content of mindi conf file now to finish structure initialization */
 /* Tempo Hack */
-#define MINDI_CONF_DIR "/etc/mindi"
+#define MINDI_CONF_DIR MONDO_CONF_DIR"/../mindi"
     if (mr_conf_open(MINDI_CONF_DIR"/mindi.conf.dist") != 0) {
             mr_log_exit(-1, "Unable to open "MINDI_CONF_DIR"/mindi.conf.dist");