Changeset 11292 for trunk

Timestamp:

07/08/11 15:25:10 (13 years ago)

Author:

lyard

Message:

added configurations to everything that can be tweaked

Location:

trunk/FACT++/src

Files:

• FilesStatisticsService.cc (modified) (1 diff)
• FilesStatisticsService.h (modified) (1 diff)
• datalogger.cc (modified) (3 diffs)

trunk/FACT++/src/FilesStatisticsService.cc

@@ -192 +192 @@
 //! @param duration the duration between two services update, in second
 //
-void FilesStatisticsService::SetStatPeriod(float duration)
+void FilesStatisticsService::SetStatPeriod(const float duration)
 {
     if (duration < 0)

trunk/FACT++/src/FilesStatisticsService.h

@@ -64 +64 @@
     bool FileOpened(const string& fileName);
     void SetDebugMode(bool);
-    void SetStatPeriod(float duration);
+    void SetStatPeriod(const float duration);
     void GetTotalSizeWritten(FileStatisticsData& data);
     void Reset();

trunk/FACT++/src/datalogger.cc

@@ -2523 +2523 @@
 {
     fDebugIsOn = conf.Get<bool>("debug");
+    fFilesStats.SetDebugMode(fDebugIsOn);
 
     //Set the block or allow list
@@ -2566 +2567 @@
         fRunNumberTimeout = timeout;
     }
+
+    //configure the run files directory
+    if (conf.Has("run_folder"))
+     {
+         const string folder = conf.Get<string>("run_folder");
+         if (fFilesStats.SetCurrentFolder(folder))
+             fRunFilePath = folder;
+         else
+             Error("Folder " + folder + " given through configuration seems invalid. Ignoring it");
+    }
+
+    //configure the nightly files directory
+    if (conf.Has("nightly_folder"))
+    {
+        const string folder = conf.Get<string>("nightly_folder");
+        if (fFilesStats.SetCurrentFolder(folder))
+            fNightlyFilePath = folder;
+        else
+            Error("Folder " + folder + " given through configuration seems invalid. Ignoring it");
+    }
+
+    //check if we have overwritten badly the directory being watched for free space
+    if (conf.Has("run_folder") && !conf.Has("nightly_folder"))
+    {//we've set the run folder for free space. we've decided it should be the nightly one. thus override it
+        fFilesStats.SetCurrentFolder(fNightlyFilePath);
+    }
+
+    //configure the interval between statistics updates
+    if (conf.Has("stats_interval"))
+    {
+        const float interval = conf.Get<float>("stats_interval");
+        fFilesStats.SetStatPeriod(interval);
+    }
+
+    //configure if the filenames service is on or off
+    if (conf.Has("filename_service"))
+    {
+        fOpenedFilesIsOn = conf.Get<bool>("filename_service");
+    }
+
+    //configure if the number of subscriptions and fits files is on or off.
+    if (conf.Has("numsubs_service"))
+    {
+        fNumSubAndFitsIsOn = conf.Get<bool>("numsubs_service");
+    }
+
     return -1;
 }
@@ -2727 +2774 @@
         ("group,g", vars<string>(), "Grouping of services into a single run-Fits")
         ("runtimeout", var<long>(), "Time out delay for old run numbers")
+        ("nightly_folder", var<string>(), "Base path for the nightly files")
+        ("run_folder", var<string>(), "Base path for the run files")
+        ("stats_interval", var<float>(), "Interval in seconds between two files statistics update")
+        ("filename_service", po_bool(), "Should the filename service be enabled?")
+        ("numsubs_service", po_bool(), "Should the number of subscriptions service be enabled?")
         ;