HPCC-31774 Changes following review

Signed-off-by: Shamser Ahmed <[email protected]>
hpcc-systems · Sep 16, 2024 · 4874eab · 4874eab
1 parent a83bf6c
commit 4874eab
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/dali/base/sysinfologger.cpp b/dali/base/sysinfologger.cpp
@@ -81,7 +81,7 @@ class CSysInfoLoggerMsg : implements ISysInfoLoggerMsg
     {
         msgPtree.setown(createPTree(MSG_NODE));
         msgPtree->setPropInt64(ATTR_ID, id);
-        msgPtree->setPropBool(ATTR_HIDDEN, false);
+        msgPtree->setPropBool(ATTR_HIDDEN, hidden);
         msgPtree->setPropInt64(ATTR_TIMESTAMP, ts);
         msgPtree->setPropInt(ATTR_CODE, code);
         msgPtree->setProp(ATTR_AUDIENCE, LogMsgAudienceToFixString(cat.queryAudience()));
@@ -343,18 +343,6 @@ class CSysInfoLoggerMsgFilter : public CSimpleInterfaceOf<ISysInfoLoggerMsgFilte
     {
         return matchEndDay;
     }
-    virtual unsigned queryMatchYear() const override
-    {
-        return (matchStartYear==matchEndYear ? matchStartYear : 0);
-    }
-    virtual unsigned queryMatchMonth() const override
-    {
-        return (matchStartMonth==matchEndMonth ? matchStartMonth : 0);
-    }
-    virtual unsigned queryMatchDay() const override
-    {
-        return (matchStartDay==matchEndDay ? matchStartDay : 0);
-    }
     virtual const char * queryMatchSource() const override
     {
         return matchSource.str();
@@ -374,12 +362,14 @@ class CSysInfoLoggerMsgFilter : public CSimpleInterfaceOf<ISysInfoLoggerMsgFilte
     virtual StringBuffer & getQualifierXPathFilter(StringBuffer & xpath) const override
     {
         bool fullDayMatch=false;
-        if (queryMatchYear() && queryMatchMonth())
+        bool hardMatchYear = matchStartYear==matchEndYear;
+        bool hardMatchMonth = matchStartMonth==matchEndMonth;
+        if (hardMatchYear && hardMatchMonth)
         {
-            xpath.appendf("m%04u%02u", queryMatchYear(), queryMatchMonth());
-            if (queryMatchDay())
+            xpath.appendf("m%04u%02u", matchStartYear, matchStartMonth);
+            if (matchStartDay==matchEndDay)
             {
-                xpath.appendf("/d%02u", queryMatchDay());
+                xpath.appendf("/d%02u", matchStartDay);
                 fullDayMatch = true;
             }
         }
@@ -443,9 +433,9 @@ class CSysInfoLoggerMsgIterator : public CSimpleInterfaceOf<ISysInfoLoggerMsgIte
 public:
     CSysInfoLoggerMsgIterator(IConstSysInfoLoggerMsgFilter * _filter, bool _updateable=false, IRemoteConnection *_conn=nullptr) : filter(_filter), updateable(_updateable), conn(_conn)
     {
-        if (_conn==nullptr)
+        if (conn==nullptr)
         {
-            unsigned mode = RTM_LOCK_READ | (updateable?RTM_LOCK_WRITE : 0);
+            unsigned mode = updateable ? RTM_LOCK_WRITE : RTM_LOCK_READ;
             conn.setown(querySDS().connect(SYS_INFO_ROOT, myProcessSession(), mode, SDS_LOCK_TIMEOUT));
             if (!conn)
                 throw makeStringExceptionV(-1, "CSysInfoLoggerMsgIterator: unable to create connection to '%s'", SYS_INFO_ROOT);
@@ -506,7 +496,7 @@ unsigned __int64 logSysInfoError(const LogMsgCategory & cat, LogMsgCode code, co
 
     IPropertyTree * root = conn->queryRoot();
     unsigned id = root->getPropInt(ATTR_NEXTID, 1);
-    if (id==INT_MAX)  // wrap id to reuse id numbers (shouldn't wrap but no harm in doing this for safety)
+    if (id==UINT_MAX)  // wrap id to reuse id numbers (shouldn't wrap but no harm in doing this for safety)
         id=1;
     root->setPropInt(ATTR_NEXTID, id+1);
 
@@ -580,7 +570,7 @@ unsigned deleteLogSysInfoMsg(IConstSysInfoLoggerMsgFilter * msgFilter)
     }
     IPropertyTree * root = conn->queryRoot();
     unsigned count = 0;
-    for (auto xpath: deleteXpathList)
+    for (auto & xpath: deleteXpathList)
     {
         if (root->removeProp(xpath.c_str()));
             ++count;
@@ -677,7 +667,7 @@ unsigned deleteOlderThanLogSysInfoMsg(bool visibleOnly, bool hiddenOnly, unsigne
     }
 
     unsigned count = 0;
-    for (auto xpath: deleteXpathList)
+    for (auto & xpath: deleteXpathList)
     {
         if (root->removeProp(xpath.c_str()));
             ++count;

diff --git a/dali/base/sysinfologger.hpp b/dali/base/sysinfologger.hpp
@@ -52,9 +52,6 @@ interface IConstSysInfoLoggerMsgFilter : public IInterface
     virtual unsigned queryEndYear() const = 0;
     virtual unsigned queryEndMonth() const = 0;
     virtual unsigned queryEndDay() const = 0;
-    virtual unsigned queryMatchYear() const = 0;
-    virtual unsigned queryMatchMonth() const = 0;
-    virtual unsigned queryMatchDay() const = 0;
     virtual const char * queryMatchSource() const = 0;
     virtual LogMsgCode queryMatchCode() const = 0;
     virtual LogMsgAudience queryMatchAudience() const = 0;