X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=include%2Fanna%2Fcore%2Foam%2FModule.hpp;h=39bc31c4b6b5f61fce66624088f19fe1a7153289;hb=3d71e5185fa9c93bde7363a668aecf96240ae2e9;hp=2208e48d48bfd7a0545995bcec6b3e2d196ec901;hpb=3e258840b15577cb8bda3cdedd0b9b88e16404b3;p=anna.git

diff --git a/include/anna/core/oam/Module.hpp b/include/anna/core/oam/Module.hpp
index 2208e48..39bc31c 100644
--- a/include/anna/core/oam/Module.hpp
+++ b/include/anna/core/oam/Module.hpp
@@ -1,37 +1,9 @@
-// ANNA - Anna is Not Nothingness Anymore
-//
-// (c) Copyright 2005-2014 Eduardo Ramos Testillano & Francisco Ruiz Rayo
-//
-// https://bitbucket.org/testillano/anna
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions
-// are met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-//
-// Authors: eduardo.ramos.testillano@gmail.com
-//          cisco.tierra@gmail.com
+// ANNA - Anna is Not Nothingness Anymore                                                         //
+//                                                                                                //
+// (c) Copyright 2005-2015 Eduardo Ramos Testillano & Francisco Ruiz Rayo                         //
+//                                                                                                //
+// See project site at http://redmine.teslayout.com/projects/anna-suite                           //
+// See accompanying file LICENSE or copy at http://www.teslayout.com/projects/public/anna.LICENSE //
 
 
 #ifndef anna_core_oam_Module_hpp
@@ -166,8 +138,8 @@ class Module {
   Handler *a_handler;              // Handler reference
 
   std::string a_className;         // module description
-  bool a_counters_enabled;         // Enable/Disable registered counters over this module (default is 'true')
-  bool a_alarms_enabled;           // Enable/Disable registered alarms over this module (default is 'true')
+  bool a_counters_enabled;         // Enable/Disable registered counters over this module (default is 'false')
+  bool a_alarms_enabled;           // Enable/Disable registered alarms over this module (default is 'false')
 
   // dynamic modifications over alarm text
   bool a_alarms_preffix_enabled;   // Show own module alarm preffix
@@ -230,10 +202,9 @@ class Module {
   alarm_iterator alarm_end() throw() { return a_alarms.end(); }
   void getAlarmPreffixSuffixAndZoneSeparator(std::string & preffix, std::string & suffix, char & zS) const throw();
 
-
 public:
 
-  static const int MaxScope = 100; /**< Numero maximo de ambitos */
+  static const int MaxScope = 1000; /**< Numero maximo de ambitos */
 
 
   /** Constructor
@@ -241,10 +212,10 @@ public:
    */
   Module(const std::string &className) :    a_className(className),
     a_handler(&a_defaultHandler),
-    a_counters_enabled(true),
+    a_counters_enabled(false),
     a_counterRecorder(NULL),
     a_counterRecording(false),
-    a_alarms_enabled(true),
+    a_alarms_enabled(false),
     a_alarms_preffix_enabled(true),
     a_alarms_suffix_enabled(true) {;}
 
@@ -278,6 +249,16 @@ public:
   */
   void disableAlarms(void) throw();
 
+  /**
+    Getter for counters enabled
+  */
+  bool countersEnabled() const throw() { return a_counters_enabled; }
+
+  /**
+    Getter for alarms enabled
+  */
+  bool alarmsEnabled() const throw() { return a_alarms_enabled; }
+
   /**
   * Show own module alarm preffix (enabled by default at constructor).
   * Usually managed at PROCCESS implementation
@@ -472,7 +453,7 @@ public:
   * @param alarmType Alarm enum-identification within the own context/module
   * @param ... Optional parsing data for dynamic-composed text.
   */
-  void activateAlarm(const int & type, ...) const throw(anna::RuntimeException);
+  void activateAlarm(int type, ...) const throw(anna::RuntimeException);
 
 
   /**
@@ -482,7 +463,7 @@ public:
   * @param alarmType Alarm enum-identification within the own context/module
   * @param ... Optional parsing data for dynamic-composed text.
   */
-  void cancelAlarm(const int & type, ...) const throw(anna::RuntimeException);
+  void cancelAlarm(int type, ...) const throw(anna::RuntimeException);
 
 
   /**