Tweaks and typos

Author: xedaq

Diff for: MongoLog.hh

@@ -13,7 +13,7 @@
 #include <vector>
 #include <atomic>
 #include <thread>
-#include <filesystem>
+#include <experimental/filesystem>
 
 #include <mongocxx/client.hpp>
 #include <mongocxx/collection.hpp>
@@ -53,7 +53,7 @@ class MongoLog{
   */
 
 public:
-  MongoLog(bool LocalFileLogging=false, int DeleteAfterDays, std::string log_dir);
+  MongoLog(bool LocalFileLogging=false, int DeleteAfterDays=7, std::string log_dir=".");
   ~MongoLog();
 
   int  Initialize(std::string connection_string,
@@ -86,7 +86,7 @@ private:
   int fDeleteAfterDays;
   int fToday;
   std::mutex fMutex;
-  std::filesystem::path fOutputDir;
+  std::experimental::filesystem::path fOutputDir;
   std::thread fFlushThread;
   std::atomic_bool fFlush;
   int fFlushPeriod;

Diff for: main.cc

@@ -35,7 +35,7 @@ void UpdateStatus(std::string suri, std::string dbname, DAQController* controlle
       // Put in status update document
       auto insert_doc = bsoncxx::builder::stream::document{};
       insert_doc << "host" << hostname <<
-        "time" << duration_cast<milliseconds>(system_clock::now().time_since_epoch()).count()<<
+        "time" << bsoncxx::types::b_date(system_clock::now())<<
 	"rate" << controller->GetDataSize()/1e6 <<
 	"status" << controller->status() <<
 	"buffer_length" << controller->GetBufferLength() <<
@@ -81,7 +81,7 @@ int main(int argc, char** argv){
   if(argc >= 4)
     dbname = argv[3];
   if (argc >= 5)
-    log_dir = argc[4];
+    log_dir = argv[4];
 
   // We will consider commands addressed to this PC's ID 
   char chostname[HOST_NAME_MAX];

Diff for: monitor/ceph_monitor.py

@@ -5,6 +5,7 @@
 import time
 from pymongo import MongoClient
 from pymongo.errors import NotMasterError
+import datetime
 timeout=2
 factors = {'k': 1e3, 'M': 1e6, 'G': 1e9, 'T': 1e12, 'B': 1, 'MiB': 1e6, 'GiB': 1e9,
            'TiB': 1e12, 'kiB': 1e3, 'kB': 1e3, 'objects,': 1}
@@ -52,7 +53,7 @@ def CheckStatus():
 
     result = subprocess.check_output(['ceph', 'status'])
     lines = result.decode().split('\n')
-    ret = {'time' : time.time()*1000}
+    ret = {'time' : datetime.datetime.utcnow()}
     for line in lines:
 
         res_list = [a.strip() for a in line.split(' ') if a != '']
@@ -97,7 +98,7 @@ def CheckStatus():
     stat['ceph_available'] = statvfs.f_frsize * statvfs.f_bavail
     try:
         coll.insert(stat)
-    except NotMasterError:
+    except:
         pass
     time.sleep(timeout)
 

Diff for: monitor/monitor.py

@@ -0,0 +1 @@
+/live_data/common_software/monitor.py