Merge branch 'stg-2.409' into stg-2.409-radius

[stg.git] / projects / stargazer / settings_impl.h

diff --git a/projects/stargazer/settings_impl.h b/projects/stargazer/settings_impl.h
index 9bcce5b0f30bed2dbb9a259d6fa061202c06b40e..1e6e2b0df6e0cf04b237e35986fdecef16484799 100644 (file)
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@ -1,9 +1,3 @@
- /*
- $Revision: 1.27 $
- $Date: 2010/08/19 13:42:30 $
- $Author: faust $
- */
-

 /*
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
 /*
  *    This program is free software; you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by


@@ -20,36 +14,27 @@
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
  *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 

-/*
- *    Date: 27.10.2002
- */
-

 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 
 /*
  *    Author : Boris Mikhailenko <stg34@stargazer.dp.ua>
  */
 

- /*
- $Revision: 1.27 $
- $Date: 2010/08/19 13:42:30 $
- */
-
-

 #ifndef SETTINGS_IMPL_H
 #define SETTINGS_IMPL_H
 
 #include "stg/settings.h"
 #include "stg/common.h"
 #include "stg/module_settings.h"
 #ifndef SETTINGS_IMPL_H
 #define SETTINGS_IMPL_H
 
 #include "stg/settings.h"
 #include "stg/common.h"
 #include "stg/module_settings.h"

+#include "stg/ref.h"

 
 #include <string>
 #include <vector>
 
 //-----------------------------------------------------------------------------
 enum DETAIL_STAT_PERIOD {
 
 #include <string>
 #include <vector>
 
 //-----------------------------------------------------------------------------
 enum DETAIL_STAT_PERIOD {

-dsPeriod_1,
-dsPeriod_1_2,
-dsPeriod_1_4,
-dsPeriod_1_6
+    dsPeriod_1,
+    dsPeriod_1_2,
+    dsPeriod_1_4,
+    dsPeriod_1_6

 };
 //-----------------------------------------------------------------------------
 class STG_LOGGER;
 };
 //-----------------------------------------------------------------------------
 class STG_LOGGER;


@@ -58,7 +43,7 @@ class DOTCONFDocumentNode;
 class SETTINGS_IMPL : public SETTINGS {
 public:
     explicit SETTINGS_IMPL(const std::string &);
 class SETTINGS_IMPL : public SETTINGS {
 public:
     explicit SETTINGS_IMPL(const std::string &);

-    SETTINGS_IMPL(const SETTINGS_IMPL &);
+    SETTINGS_IMPL(const SETTINGS_IMPL & rhs);

     virtual ~SETTINGS_IMPL() {}
     SETTINGS_IMPL & operator=(const SETTINGS_IMPL &);
 
     virtual ~SETTINGS_IMPL() {}
     SETTINGS_IMPL & operator=(const SETTINGS_IMPL &);
 


@@ -75,7 +60,7 @@ public:
     const std::string & GetRulesFileName() const { return rules; }
     const std::string & GetLogFileName() const { return logFile; }
     const std::string & GetPIDFileName() const { return pidFile; }
     const std::string & GetRulesFileName() const { return rules; }
     const std::string & GetLogFileName() const { return logFile; }
     const std::string & GetPIDFileName() const { return pidFile; }

-    unsigned            GetDetailStatWritePeriod() const 
+    unsigned            GetDetailStatWritePeriod() const

         { return detailStatWritePeriod; }
     unsigned            GetStatWritePeriod() const { return statWritePeriod * 60; }
     unsigned            GetDayFee() const { return dayFee; }
         { return detailStatWritePeriod; }
     unsigned            GetStatWritePeriod() const { return statWritePeriod * 60; }
     unsigned            GetDayFee() const { return dayFee; }


@@ -104,9 +89,6 @@ public:
 
 private:
 
 
 private:
 

-    int ParseDetailStatWritePeriod(const std::string & str);
-    int ParseModuleSettings(const DOTCONFDocumentNode * dirNameNode, std::vector<PARAM_VALUE> * params);
-

     static void ErrorCallback(void * data, const char * buf);
 
     std::string strError;
     static void ErrorCallback(void * data, const char * buf);
 
     std::string strError;


@@ -115,7 +97,7 @@ private:
     std::string modulesPath;
     std::vector<std::string> dirName;
     std::string confDir;
     std::string modulesPath;
     std::vector<std::string> dirName;
     std::string confDir;

-    std::string        scriptsDir;
+    std::string scriptsDir;

     std::string rules;
     std::string logFile;
     std::string pidFile;
     std::string rules;
     std::string logFile;
     std::string pidFile;


@@ -142,7 +124,7 @@ private:
 
     std::vector<MODULE_SETTINGS> modulesSettings;
     MODULE_SETTINGS storeModuleSettings;
 
     std::vector<MODULE_SETTINGS> modulesSettings;
     MODULE_SETTINGS storeModuleSettings;

-    STG_LOGGER & logger;
+    STG::RefWrapper<STG_LOGGER> logger;

 };
 //-----------------------------------------------------------------------------
 
 };
 //-----------------------------------------------------------------------------