Ticket 37. TariffChangelsAllowed() virtual function declaration added.

[stg.git] / stglibs / logger.lib / logger.cpp

diff --git a/stglibs/logger.lib/logger.cpp b/stglibs/logger.lib/logger.cpp
index 14c09591f0394147c3527a1ec253ad746e59c865..4a4552576da1df7b1536eb55baeef62acb0898af 100644 (file)
--- a/stglibs/logger.lib/logger.cpp
+++ b/stglibs/logger.lib/logger.cpp
@@ -43,10 +43,33 @@ va_start(vl, fmt);
 vsnprintf(buff, sizeof(buff), fmt, vl);
 va_end(vl);
 
 vsnprintf(buff, sizeof(buff), fmt, vl);
 va_end(vl);
 

-FILE * f;
+LogString(buff);
+}
+//-----------------------------------------------------------------------------
+const char * STG_LOGGER::LogDate(time_t t) const
+{
+static char s[32];
+if (t == 0)
+    t = time(NULL);
+
+struct tm * tt = localtime(&t);
+
+snprintf(s, 32, "%d-%s%d-%s%d %s%d:%s%d:%s%d",
+         tt->tm_year + 1900,
+         tt->tm_mon + 1 < 10 ? "0" : "", tt->tm_mon + 1,
+         tt->tm_mday    < 10 ? "0" : "", tt->tm_mday,
+         tt->tm_hour    < 10 ? "0" : "", tt->tm_hour,
+         tt->tm_min     < 10 ? "0" : "", tt->tm_min,
+         tt->tm_sec     < 10 ? "0" : "", tt->tm_sec);
+
+return s;
+}
+//-----------------------------------------------------------------------------
+void STG_LOGGER::LogString(const char * str) const
+{

 if (!fileName.empty())
     {
 if (!fileName.empty())
     {

-    f = fopen(fileName.c_str(), "at");
+    FILE * f = fopen(fileName.c_str(), "at");

     if (f)
         {
         #ifdef STG_TIME
     if (f)
         {
         #ifdef STG_TIME


@@ -55,56 +78,29 @@ if (!fileName.empty())
         fprintf(f, "%s", LogDate(time(NULL)));
         #endif
         fprintf(f, " -- ");
         fprintf(f, "%s", LogDate(time(NULL)));
         #endif
         fprintf(f, " -- ");

-        fprintf(f, "%s", buff);
+        fprintf(f, "%s", str);

         fprintf(f, "\n");
         fclose(f);
         }
     else
         {
         openlog("stg", LOG_NDELAY, LOG_USER);
         fprintf(f, "\n");
         fclose(f);
         }
     else
         {
         openlog("stg", LOG_NDELAY, LOG_USER);

-        syslog(LOG_CRIT, "%s", buff);
+        syslog(LOG_CRIT, "%s", str);

         closelog();
         }
     }
 else
     {
     openlog("stg", LOG_NDELAY, LOG_USER);
         closelog();
         }
     }
 else
     {
     openlog("stg", LOG_NDELAY, LOG_USER);

-    syslog(LOG_CRIT, "%s", buff);
+    syslog(LOG_CRIT, "%s", str);

     closelog();
     }
 }
 //-----------------------------------------------------------------------------
     closelog();
     }
 }
 //-----------------------------------------------------------------------------

-const char * STG_LOGGER::LogDate(time_t t) const
+PLUGIN_LOGGER::PLUGIN_LOGGER(const STG_LOGGER& logger, const std::string& pn)
+    : m_parent(logger),
+      m_pluginName(pn)

 {
 {

-static char s[32];
-if (t == 0)
-    t = time(NULL);
-
-struct tm * tt = localtime(&t);
-
-snprintf(s, 32, "%d-%s%d-%s%d %s%d:%s%d:%s%d",
-         tt->tm_year + 1900,
-         tt->tm_mon + 1 < 10 ? "0" : "", tt->tm_mon + 1,
-         tt->tm_mday    < 10 ? "0" : "", tt->tm_mday,
-         tt->tm_hour    < 10 ? "0" : "", tt->tm_hour,
-         tt->tm_min     < 10 ? "0" : "", tt->tm_min,
-         tt->tm_sec     < 10 ? "0" : "", tt->tm_sec);
-
-return s;
-}
-//-----------------------------------------------------------------------------
-PLUGIN_LOGGER::PLUGIN_LOGGER(const STG_LOGGER & logger, const std::string & pn)
-    : STG_LOGGER(),
-      pluginName(pn)
-{
-    SetLogFileName(logger.fileName);
-}
-//-----------------------------------------------------------------------------
-PLUGIN_LOGGER::PLUGIN_LOGGER(const PLUGIN_LOGGER & rhs)
-    : STG_LOGGER(),
-      pluginName(rhs.pluginName)
-{
-    SetLogFileName(fileName);

 }
 //-----------------------------------------------------------------------------
 void PLUGIN_LOGGER::operator()(const char * fmt, ...) const
 }
 //-----------------------------------------------------------------------------
 void PLUGIN_LOGGER::operator()(const char * fmt, ...) const


@@ -116,7 +112,12 @@ va_start(vl, fmt);
 vsnprintf(buff, sizeof(buff), fmt, vl);
 va_end(vl);
 
 vsnprintf(buff, sizeof(buff), fmt, vl);
 va_end(vl);
 

-STG_LOGGER::operator()("[%s] %s", pluginName.c_str(), buff);
+m_parent("[%s] %s", m_pluginName.c_str(), buff);
+}
+//-----------------------------------------------------------------------------
+void PLUGIN_LOGGER::operator()(const std::string & line) const
+{
+m_parent("[%s] %s", m_pluginName.c_str(), line.c_str());

 }
 //-----------------------------------------------------------------------------
 PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName)
 }
 //-----------------------------------------------------------------------------
 PLUGIN_LOGGER GetPluginLogger(const STG_LOGGER & logger, const std::string & pluginName)