+ Improves:

	- Add logging rotation
	- Add configuration file
	- Add steps on stup.py for automate installation.

19 files changed, 24 insertions, 121 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3df4d76
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+build/
+logs/
+rrds/
diff --git a/setup.py b/setup.py
index e3b6440..51d68dc 100644
--- a/setup.py
+++ b/setup.py
@@ -2,13 +2,17 @@ from distutils.core import setup
 
 setup(
     name = "stats_consolidation",
-    version = "0.1.0",
+    version = "1.0.0",
     description = "Statistics translator from rrd to relational db",
     author = "Gustavo Duarte",
     author_email = "gduarte@activitycentral.com",
     url = "http://www.acrtivitycentral.com/",
+    data_files=[('/usr/local/bin', ['stats_consolidation/stats_consolidation_run']),
+		('/etc/cron.d', ['stats-consolidation.cron']),
+		('/etc',['stats-consolidation.conf'])
+    ],
     packages=[
-        'sugar_stats_consolidation',
+        'stats_consolidation',
     ],
     package_dir={'': ''}
 )
diff --git a/sql/make_report b/sql/make_report
index c8667da..a0816f9 100755
--- a/sql/make_report
+++ b/sql/make_report
@@ -16,10 +16,13 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
-from sugar_stats_consolidation.db import *
+
 import sys
 import logging
 
+sys.path.append('/home/gustavo/ac/statistics/stats-consolidation/src/')
+from db import *
+
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--query',required=True)
diff --git a/sql/rep_activity_list_by_desktop.sh b/sql/rep_activity_list_by_desktop.sh
index 7d143ee..006033b 100755
--- a/sql/rep_activity_list_by_desktop.sh
+++ b/sql/rep_activity_list_by_desktop.sh
@@ -7,7 +7,7 @@ QUERY=activity_most_used
 CANT_MAX=10
 DESKTOP=any
 START_DATE=2013-02-10
-END_DATE=2013-02-14
+END_DATE=2013-03-30
 
 
 
diff --git a/src/consolidation_run b/src/consolidation_run
deleted file mode 100755
index 3c514a7..0000000
--- a/src/consolidation_run
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env  python
-
-# Copyright (C) 2012, Gustavo Duarte
-#
-# 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
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# 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 ConfigParser
-import logging
-import sys, os
-
-
-sys.path.append(os.getcwd())
-
-from db import *
-from rrd_files import *
-from consolidation import *
-	
-parser = argparse.ArgumentParser()	
-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'
-_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 (db_name, db_user, db_pass)
-		db.create()
-	except Exception as e:
-		log.warning('Creating DB: %s', str(e))
-
-
-	try:
-		con = Consolidation(rrd_path, db)
-		con.process_rrds()
-		db.close()
-	
-		log.info('**************************************')
-		log.info('       Finish consolidation           ')
-		log.info('**************************************')
-	except Exception as e:
-		log.warning('Processing rrd file: %s', str(e))
-
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/run.sh b/src/run.sh
deleted file mode 100755
index d3b4338..0000000
--- a/src/run.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-DB_USER="root"
-DB_PASS="gustavo"
-DB_NAME="statistics"
-RRD_PATH=/var/lib/sugar-stats/rrd
-APP_PATH=/home/ceibal/ac/statistics-consolidation
-LOG_PATH=$APP_PATH/log
-
-echo `date`: Starting consolidation      
-$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
diff --git a/stats-consolidation.cron b/stats-consolidation.cron
index 843d881..d72cca7 100644
--- a/stats-consolidation.cron
+++ b/stats-consolidation.cron
@@ -1,4 +1,4 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-BASE_PATH=/home/ceibal/ac/statistics-consolidation
-0 3 * * * root $BASE_PATH/sugar_stats_consolidation/run.sh > $BASE_PATH/log/out.txt
+
+0 3 * * * root stats_consolidation --config_file /etc/stats-consolidation.conf > $BASE_PATH/log/out.txt
 
diff --git a/src/__init__.py b/stats_consolidation/__init__.py
index c06c47d..c06c47d 100644
--- a/src/__init__.py
+++ b/stats_consolidation/__init__.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/__init__.py b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/__init__.py
index dd6e324..dd6e324 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/__init__.py
+++ b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/__init__.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/consolidation.py b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/consolidation.py
index 4003594..4003594 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/consolidation.py
+++ b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/consolidation.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/db.py b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/db.py
index a8939e5..a8939e5 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/db.py
+++ b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/db.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/rrd_files.py b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/rrd_files.py
index a437e0d..a437e0d 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/rrd_files.py
+++ b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/rrd_files.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/setup.py b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/setup.py
index 00585ee..00585ee 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/setup.py
+++ b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/setup.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_cons.py b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_cons.py
index 00f43b5..00f43b5 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_cons.py
+++ b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_cons.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_db.py b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_db.py
index 197510a..197510a 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_db.py
+++ b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_db.py
diff --git a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_rrd.py b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_rrd.py
index 657ce18..657ce18 100644
--- a/src/build/lib.linux-x86_64-2.7/stats_consolidation/test_rrd.py
+++ b/stats_consolidation/build/lib.linux-x86_64-2.7/stats_consolidation/test_rrd.py
diff --git a/src/consolidation.py b/stats_consolidation/consolidation.py
index 8c0912e..fd75143 100644
--- a/src/consolidation.py
+++ b/stats_consolidation/consolidation.py
@@ -2,13 +2,12 @@ import os
 import argparse
 import logging
 
-import rrd_files
-import db
-from rrd_files import *
-from db import *
+from stats_consolidation.db import *
+from stats_consolidation.rrd_files import *
 
 
-log = logging.getLogger(__name__)
+log = logging.getLogger("stats-consolidation")
+#log = logging.getLogger(__name__)
 
 class Consolidation:
 	
diff --git a/src/db.py b/stats_consolidation/db.py
index ca55661..d6593a7 100644
--- a/src/db.py
+++ b/stats_consolidation/db.py
@@ -4,12 +4,9 @@ from mysql.connector import errorcode
 
 from datetime import datetime
 import logging
+from stats_consolidation.rrd_files import *
 
-sys.path.append(os.getcwd())
-
-from rrd_files import *
-
-log = logging.getLogger(__name__)
+log = logging.getLogger("stats-consolidation")
 
 class DB_Stats:
 	TABLES={}
diff --git a/src/rrd_files.py b/stats_consolidation/rrd_files.py
index c82d3cb..be13ae0 100644
--- a/src/rrd_files.py
+++ b/stats_consolidation/rrd_files.py
@@ -5,7 +5,8 @@ import rrdtool
 from datetime import datetime
 
 
-log = logging.getLogger(__name__)
+#log = logging.getLogger(__name__)
+log = logging.getLogger("stats-consolidation")
 
 
 class RRD: