Changeset 5883

Timestamp:

07/24/08 10:44:45 (2 months ago)

Author:

rbertholon

Message:

correction in logger (log.c file)

Location:

trunk/centstorage

Files:

• ChangeLog (modified) (1 diff)
• modules/recup_perf_datas/connection_SSL.c (modified) (1 diff)
• src/Conf.c (modified) (1 diff)
• src/log.c (modified) (2 diffs)
• src/reloadConf.c (modified) (1 diff)

trunk/centstorage/ChangeLog

@@ -2 +2 @@
  CentStorage ChangeLog
 #########################
+
+??? - 07/24/2008
+-----------------
+* Correction of a little bug in the logger
 
 ??? - 07/23/2008

trunk/centstorage/modules/recup_perf_datas/connection_SSL.c

@@ -81 +81 @@
   tmp = (argssl_t *)arg;
 
-  printf("try creating the SSL connection\n");
   if (tmp->reload)
     {

trunk/centstorage/src/Conf.c

@@ -166 +166 @@
                       conf->logs->time = 24;
                   }
-                free(tmp);
+                if (tmp)
+                  free(tmp);
                 break ;
               }

trunk/centstorage/src/log.c

@@ -157 +157 @@
           || !unit && openedTime + (3600 * 24 * ti) < time(NULL))
         {
-          char  date[32];
+          char  date[32], *tmp;
           int   i, j, count;
           char  *arch_log;
@@ -172 +172 @@
                   if (date[j - 1] != UNDERSCORE)
                     date[j++] = UNDERSCORE;
+                  if (conf->logs->unit && count == 3)
+                    tmp = &char_time[i] + 1;
                 }
               else if (count == 1 || count == 2 || count == 4)
                 {
                   date[j] = char_time[i];
+                  ++j;
+                }
+            }
+          if (conf->logs->unit)
+            {
+              count = 0;
+              date[j++] = '_';
+              for (i = 0; i < 9; ++i)
+                {
+                  date[j] = tmp[i];
+                  if (date[j] == ':')
+                    {
+                      if (count == 0)
+                        date[j] = 'h';
+                      else if (count == 1)
+                        date[j] = 'm';
+                    }
+                  else if (date[j] == ' ')
+                    date[j] = 's';
                   ++j;
                 }

trunk/centstorage/src/reloadConf.c

@@ -200 +200 @@
 
   reloadModules(saveConf);
-
+ 
   /* this part is written to avoid some mmory leaks */
   if (conf->modules)