From: Maxim Mamontov <faust.madf@gmail.com>
Date: Sat, 21 Jan 2017 19:02:07 +0000 (+0200)
Subject: Merge branch 'stg-2.409' into stg-2.409-radius
X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/22cb2560274e05e6490cf964cbbeb74a1991c642?hp=-c

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

22cb2560274e05e6490cf964cbbeb74a1991c642
diff --combined projects/stargazer/settings_impl.h
index 2bac34e4,9bcce5b0..1e6e2b0d
--- a/projects/stargazer/settings_impl.h
+++ b/projects/stargazer/settings_impl.h
@@@ -1,3 -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
@@@ -14,27 -20,36 +14,27 @@@
   *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
  
 -/*
 - *    Date: 27.10.2002
 - */
 -
  /*
   *    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 <string>
- #include <vector>
- 
  #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 {
 -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;
@@@ -42,8 -57,8 +42,8 @@@ class DOTCONFDocumentNode
  //-----------------------------------------------------------------------------
  class SETTINGS_IMPL : public SETTINGS {
  public:
-     SETTINGS_IMPL(const std::string &);
+     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 &);
  
@@@ -60,7 -75,7 +60,7 @@@
      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; }
@@@ -89,6 -104,9 +89,6 @@@
  
  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;
@@@ -97,7 -115,7 +97,7 @@@
      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;
@@@ -124,7 -142,7 +124,7 @@@
  
      std::vector<MODULE_SETTINGS> modulesSettings;
      MODULE_SETTINGS storeModuleSettings;
 -    STG_LOGGER & logger;
 +    STG::RefWrapper<STG_LOGGER> logger;
  };
  //-----------------------------------------------------------------------------