Changeset 6701

Timestamp:

10/03/08 10:53:39 (2 months ago)

Author:

rbertholon

Message:

fixed some mess and modif the censtorage start/stop script

Location:

trunk/centstorage

Files:

• centstorage (modified) (3 diffs)
• includes/Conf.h (modified) (3 diffs)
• modules/recup_perf_datas/insertValInMySQLDataBase.c (modified) (1 diff)
• modules/recup_perf_datas/interval.c (modified) (1 diff)
• modules/rrd/interval.c (modified) (1 diff)
• modules/rrd/interval.h (modified) (1 diff)
• src/Conf.c (modified) (1 diff)
• src/centstorage.c (modified) (6 diffs)

trunk/centstorage/centstorage

@@ -84 +84 @@
 
 prefix=/usr/local/centreon
-Bin=/usr/local/centreon/bin/centstorage
-centstorageLogDir=/usr/local/centreon/log
+Bin=${prefix}/bin/centstorage
+
+# log directory
+centstorageLogDir=${prefix}/log
+centstorageDemLog=${centstorageLogDir}/centstorage.log
+
+# running (pid file)
 centstorageRunDir=/var/run/centreon
-#centstorageVarDir=${prefix}/var/
 centstorageRunFile=${centstorageRunDir}/centstorage.pid
-centstorageDemLog=${centstorageLogDir}/centstorage.log
+
+#lock file
 centstorageLockDir=/var/lock
 centstorageLockFile=centstorage.lock
@@ -97 +102 @@
 if [ ! -f $centstorageBin ]; then
     echo "Executable file $centstorageBin not found.  Exiting."
-    exit 1
-fi
-
-# Check that centstorage.cfg exists.
-if [ ! -f $centstorageCfgFile ]; then
-    echo "Configuration file $centstorageCfgFile not found.  Exiting."
     exit 1
 fi
@@ -119 +118 @@
             echo "Removing centstorage pid file"
         else
+            echo "$centstorageRunFile already running"
             exit 1
         fi

trunk/centstorage/includes/Conf.h

@@ -70 +70 @@
 #define DEFAULT_LOG_LEVEL       0
 
+#define DEFAULT_PID_FILE        "/var/run/centreon/centstorage.pid"
+
 #define XPATH_LOG_FILE(root)    "/"root"/logging/logFile/text()"
 #define XPATH_LOG_LEVEL(root)   "/"root"/logging/level/text()"
@@ -92 +94 @@
 #define XPATH_DB_CONF_USER(root) "/"root"/DataBases/confDB/user/text()"
 #define XPATH_DB_CONF_PASS(root) "/"root"/DataBases/confDB/pass/text()"
+
+#define XPATH_PID_FILE(root) "/"root"/PidFile/text()"
 
 /* this structure contains all the value needed to connect a client to a
@@ -158 +162 @@
   /* informations about configuration file */
   char                  *confFile;
+  char                  *pidFile;
+  short                 defPidFile;
   int                   timeout;
   unsigned short        unit;

trunk/centstorage/modules/recup_perf_datas/insertValInMySQLDataBase.c

@@ -148 +148 @@
     }
 
-  if (!strncmp( "meta_", svce, 5))
-    {
-      index_id = insertMetaIndexDataMySQL(svce, &mysql, &rped_conf_db_connection,
+  if (!strncmp( "meta_", svce, 5) || !strncmp( "qos_", svce, 4))
+    {
+      index_id = insertMetaIndexDataMySQL(svce, &mysql, (MYSQL **)&rped_conf_db_connection,
                                           log, confModule->timeRetry);
       if (!index_id)

trunk/centstorage/modules/recup_perf_datas/interval.c

@@ -86 +86 @@
               return selectInterval(type, request, log, timeRetry);
             }
-          else if (!strncmp("osl_", queryresult[3], 4))
+          else if (!strncmp("qos_", queryresult[3], 4))
             {
               /* second possibility : service_description begins with "osl_" */

trunk/centstorage/modules/rrd/interval.c

@@ -88 +88 @@
                                     *conf_db_connection, MOD_NAME);
             }
-          else if (!strncmp("osl_", queryresult[3], 4))
+          else if (!strncmp("qos_", queryresult[3], 4))
             {
-              /* second possibility : service_description begins with "osl_" */
+              /* second possibility : service_description begins with "qos_" */
 
               int       oslId = atoi(queryresult[3] + 4);

trunk/centstorage/modules/rrd/interval.h

@@ -35 +35 @@
 #define SELECT_CHECK_INTER_META "SELECT normal_check_interval FROM meta_service WHERE meta_id="
 #define ERROR_SELECT_INTERVAL "Cannot select interval"
-#define SELECT_CHECK_INTER_OSL "SELECT normal_check_interval FROM osl WHERE osl_id="
+#define SELECT_CHECK_INTER_OSL "SELECT normal_check_interval FROM qos WHERE qos_id="
 #define MYSQL_RESULT "mysql_result(MYSQL *) failed"
 

trunk/centstorage/src/Conf.c

@@ -240 +240 @@
     free(tmp);
 
+  tmp = getParam(XPATH_PID_FILE(ROOT_ELEMENT), xmlConfContext, doc);
+  conf->pidFile = (tmp ? tmp : DEFAULT_PID_FILE);
+  conf->defPidFile = (tmp ? FALSE : TRUE);
+
   loadBaseConf(xmlConfContext, doc);
   loadBasePerf(xmlConfContext, doc);

trunk/centstorage/src/centstorage.c

@@ -61 +61 @@
     logger("Exit CentStorage");
   exit(EXIT_FAILURE);
+}
+
+void    initVal(void)
+{
+  conf = x_malloc(sizeof(*conf));
+  conf->confFile = DEFAULT_CONF_FILE;
+  conf->timeout = 0;
+  conf->logs = x_malloc(sizeof(logging_t));
+  conf->logs->log_file = NULL;
+  conf->logs->log = 0;
+  conf->logs->defLogFile = 1;
+  conf->logs->logFileOpened = 0;
 }
 
@@ -162 +174 @@
 int             main(int argc, char **argv)
 {
-  int           retVal;
   char          *logging;
   FILE          *PID;
@@ -169 +180 @@
   mtrace();
 
-  PID = fopen("./centstorage.pid", "w");
-  fprintf(PID, "%d", getpid());
-  fclose(PID);
-
   /* printing welcome message */
   printf("%s\n\n", WELCOME_MESSAGE);
 
   /* values initialisation */
-  conf = x_malloc(sizeof(*conf));
-  conf->confFile = DEFAULT_CONF_FILE;
-
-  conf->timeout = 0;
-
-  conf->logs = x_malloc(sizeof(logging_t));
-  conf->logs->log_file = NULL;
-  conf->logs->log = 0;
-  conf->logs->defLogFile = 1;
-  conf->logs->logFileOpened = 0;
+  initVal();
 
   /* checking arguments */
@@ -193 +191 @@
 
   /* loading configuration */
-  retVal = loadConf(conf->confFile);
-  if (retVal == -1)
+  if (loadConf(conf->confFile) == -1)
     loadDefaultConfiguration();
+
+  PID = fopen(conf->pidFile, "w");
+  if (!PID)
+    return -1;
+  fprintf(PID, "%d", getpid());
+  fclose(PID);
+  if (!conf->defPidFile)
+    free(conf->pidFile);
 
   /* opening logging file */
@@ -210 +215 @@
         {
           conf->logs->logFileOpened = 1;
-          if (logger(CENTSTORAGE_START) == -1)
-            fprintf(stderr, "%s.\n", ERROR_INFOS_LOGS);
+          if (conf->logs->log)
+            logger(CENTSTORAGE_START);
         }
     }
@@ -230 +235 @@
     free(conf->logs->log_file);
 
+  unlink(conf->pidFile);
   free(conf->logs);
   free(conf);