+ Improves:

	Add configuration file management instead passing arguments by stdin

4 files changed, 44 insertions, 19 deletions

diff --git a/src/consolidation_run b/src/consolidation_run
index 7ef1a5c..3c514a7 100755
--- a/src/consolidation_run
+++ b/src/consolidation_run
@@ -15,45 +15,68 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-import argparse
+import argparse 
+import ConfigParser
 import logging
+import sys, os
 
-from sugar_stats_consolidation.db import *
-from sugar_stats_consolidation.rrd_files import *
-from sugar_stats_consolidation.consolidation import *
+
+sys.path.append(os.getcwd())
+
+from db import *
+from rrd_files import *
+from consolidation import *
 	
 parser = argparse.ArgumentParser()	
-parser.add_argument('--db_user',required=True)
-parser.add_argument('--db_pass',required=True)
-parser.add_argument('--db_name',required=True)
-parser.add_argument('--rrd_path',required=True)
-parser.add_argument('--log_path',required=True)
+parser.add_argument('--config_file', required=False)
 
+#parser.add_argument('--db_user',required=True)
+#parser.add_argument('--db_pass',required=True)
+#parser.add_argument('--db_name',required=True)
+#parser.add_argument('--rrd_path',required=True)
+#parser.add_argument('--log_path',required=True)
 args = parser.parse_args()
 
 
 _LOG_FORMAT='[%(asctime)s]-%(levelname)s-\'%(name)s\': %(message)s'
-
-logging.basicConfig(filename=os.path.join(args.log_path,'sugar-stats-consolidation.log'), format=_LOG_FORMAT, level=logging.DEBUG)
-log = logging.getLogger(__name__)
+_LOG_LEVEL={'debug':logging.DEBUG, 'info':logging.INFO, 'warning':logging.WARNING, 'error':logging.ERROR}
+#logging.basicConfig(filename=os.path.join(args.log_path,'sugar-stats-consolidation.log'), format=_LOG_FORMAT, level=logging.DEBUG)
+#log = logging.getLogger(__name__)
+log=None
 
 def main():
 
+	config = ConfigParser.ConfigParser()
+	if (args.config_file == None):
+		config_file = "./stats-consolidation.conf"	
+	else:
+		config_file = args.config_file
+
+	config.read(config_file)
+
+	log_path = config.get('main', 'log_path') 
+	log_level = config.get('main', 'log_level')  
+	db_name = config.get('main', 'db_name')
+	db_user = config.get('main', 'db_user') 
+	db_pass = config.get('main', 'db_pass')
+	rrd_path = config.get('main', 'rrd_path')
+	
+	logging.basicConfig(filename=os.path.join(log_path,'sugar-stats-consolidation.log'), format=_LOG_FORMAT, level=_LOG_LEVEL[log_level])
+	log = logging.getLogger(__name__)
 	
 	log.info('**************************************')
 	log.info('       Starting consolidation         ')
 	log.info('**************************************')
 	
-	
 	try:
-		db = DB_Stats (args.db_name, args.db_user, args.db_pass)
+		db = DB_Stats (db_name, db_user, db_pass)
 		db.create()
 	except Exception as e:
 		log.warning('Creating DB: %s', str(e))
 
 
 	try:
-		con = Consolidation(args.rrd_path, db)
+		con = Consolidation(rrd_path, db)
 		con.process_rrds()
 		db.close()
 	
diff --git a/src/db.py b/src/db.py
index 647f69c..ca55661 100644
--- a/src/db.py
+++ b/src/db.py
@@ -1,10 +1,11 @@
 import mysql.connector
+import sys, os
 from mysql.connector import errorcode
+
 from datetime import datetime
 import logging
 
-
-import sugar_stats_consolidation.rrd_files
+sys.path.append(os.getcwd())
 
 from rrd_files import *
 
diff --git a/src/rrd_files.py b/src/rrd_files.py
index 21c48df..c82d3cb 100644
--- a/src/rrd_files.py
+++ b/src/rrd_files.py
@@ -1,9 +1,10 @@
-import rrdtool
 import os
 import sys
 import logging
+import rrdtool
 from datetime import datetime
 
+
 log = logging.getLogger(__name__)
 
 
diff --git a/src/run.sh b/src/run.sh
index 05bb6ca..d3b4338 100755
--- a/src/run.sh
+++ b/src/run.sh
@@ -6,7 +6,7 @@ APP_PATH=/home/ceibal/ac/statistics-consolidation
 LOG_PATH=$APP_PATH/log
 
 echo `date`: Starting consolidation      
-$APP_PATH/sugar_stats_consolidation/consolidation_run --db_user $DB_USER --db_pass $DB_PASS --db_name $DB_NAME --rrd_path $RRD_PATH --log_path $LOG_PATH
+$APP_PATH/src/consolidation_run --db_user $DB_USER --db_pass $DB_PASS --db_name $DB_NAME --rrd_path $RRD_PATH --log_path $LOG_PATH
 echo `date`: Ending consolidation        
 
 exit 0