change db url to ini file

antonygc91
1 parent c452bde3
Showing 3 changed files with 58 additions and 65 deletions Show diff stats
wscserver/__init__.py
wscserver/model/__init__.py
wscserver/view/restfulview.py
-from pyramid.config import Configurator
-from pyramid_restler import includeme
-from sqlalchemy import engine_from_config, create_engine
-from sqlalchemy.orm import sessionmaker
-from wscserver.config.routing import make_routes
-from wscserver.model import initialize_sql, sqlalchemy_url
+from sqlalchemy import create_engine
+from pyramid_restler import includeme
+from pyramid.config import Configurator
+from sqlalchemy.orm import sessionmaker
+from sqlalchemy import engine_from_config
 def main(global_config, **settings):
     """
     This function returns a Pyramid WSGI application.
     """
+
+    from wscserver.model import initialize_sql
+
+    initialize_sql(settings)
     config = Configurator(settings=settings)
     config.scan('wscserver.model')  # the "important" line
-    engine = create_engine(sqlalchemy_url)
-    initialize_sql(engine)
-    includeme(config)
+    from wscserver.config.routing import make_routes
+
+    includeme(config)
     make_routes(config)
     config.scan('wscserver')
+
     return config.make_wsgi_app()
 # from sqlalchemy import engine_from_config
-from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import scoped_session, sessionmaker
-from sqlalchemy.engine import create_engine
+
+
 from pyramid import config
+from sqlalchemy.engine import create_engine
 from paste.deploy.loadwsgi import appconfig
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import scoped_session, sessionmaker
+
+def initialize_sql(settings):
-sqlalchemy_url = 'postgresql://cacic:cacic@localhost/cacic'
-DBSession = scoped_session(sessionmaker())
-Base = declarative_base()
-engine = create_engine(sqlalchemy_url)
-Session = sessionmaker(bind=engine)
-session = Session()
+    global DBSession
+    global sqlalchemy_url
+    global DBSession
+    global Base
+    global engine
+    global Session
+    global session
+    sqlalchemy_url = settings['sqlalchemy.url']
+    DBSession = scoped_session(sessionmaker())
+    Base = declarative_base()
+    engine = create_engine(sqlalchemy_url)
+    Session = sessionmaker(bind=engine)
+    session = Session()
-def initialize_sql(engine):
     DBSession.configure(bind=engine)
     Base.metadata.bind = engine
     # Base.metadata.create_all(engine)
+
+
+
+
 import json
-import hashlib
-
 from pyramid.response import Response
 from wscserver.model import session
-
+import zipfile
 FILE_BEGIN = '{"results":['
 FILE_END = '], "result_count": %s}'
@@ -33,21 +31,20 @@ FILTER_KEYS = str(tuple(COMPUTER_FILTER.keys()))
 def viewcoleta(request):
-    #create index idx_id_computador on computador_coleta(id_computador);
+    # Please ensure this index exists on database
+    # CREATE INDEX idx_id_computador ON computador_coleta(id_computador);
     limit = request.params.get('limit', 'NULL')
     stmt1 = """
-        SELECT 
-            id_computador 
+        SELECT id_computador 
         FROM computador_coleta 
         GROUP BY id_computador
         LIMIT {};
-    """.format(limit)
+        """.format(limit)
     computer_ids = session.execute(stmt1)
-
     stmt2 = """
         SELECT classe.nm_class_name,
                cp.nm_property_name,
@@ -56,7 +53,7 @@ def viewcoleta(request):
             INNER JOIN class_property as cp ON (cc.id_class_property =
                 cp.id_class_property)
             INNER JOIN classe ON (classe.id_class = cp.id_class)
-            WHERE cc.id_computador = {} AND
+        WHERE cc.id_computador = {} AND
             classe.nm_class_name IN {};
         """
@@ -80,13 +77,22 @@ def viewcoleta(request):
         f.write(FILE_END % computer_ids.rowcount)
-    return Response('ok')
-   #return Response(
-   #    content_type='application/json',
-   #    content_disposition='filename=coleta.json',
-   #    app_iter=[open('/var/antony/coleta.json', 'rb').read()]
-   #)
+    if '1' in tuple(request.params.get('zip')):
+        with zipfile.ZipFile('/tmp/coleta.zip', 'w') as myzip:
+            myzip.write('/tmp/coleta.json')
+
+        return Response(
+           content_type='application/zip',
+           content_disposition='filename=coleta.zip',
+           body_file=open('/tmp/coleta.zip', 'rb'))
+    else:
+        return Response(
+           content_type='application/json',
+           content_disposition='filename=coleta.json',
+           body_file=open('/tmp/coleta.json'))
+
+    return Response('ok')
 def build_computer_json(computer_group):
@@ -116,34 +122,3 @@ def build_computer_json(computer_group):
     return json.dumps(computer)
-def zipcoleta():
-    """Recebe o json da coleta em um arquivo e zipa"""
-    coleta = requests.get('http://localhost/wscserver/rest/coleta')
-
-    tmpdir = tempfile.gettempdir()
-    os.chdir(tmpdir)
-    f = open('coleta.json','r')
-    arquivozip = 'coleta.zip'
-    with zipfile.ZipFile(arquivozip, 'w') as myzip:
-        myzip.write(f.name)
-    f.close()
-    os.remove('coleta.json')
-    filepath = os.path.abspath(arquivozip)
-    return filepath
-'''
-def zipcoleta():
-    """Recebe o json da coleta em um arquivo e zipa"""
-    coleta = requests.get('http://localhost/wscserver/rest/coleta')
-
-    path = tempfile.gettempdir()
-    os.chdir(path)
-    f = open('coleta.json','w')
-    f.write(coleta.text)
-    arquivozip = 'coleta.zip'
-    with zipfile.ZipFile(arquivozip, 'w') as myzip:
-        myzip.write(f.name)
-    f.close()
-    os.remove('coleta.json')
-    filepath = os.path.abspath(arquivozip)
-    return filepath
-'''
1	# from sqlalchemy import engine_from_config	1	# from sqlalchemy import engine_from_config
2	-from sqlalchemy.ext.declarative import declarative_base
3	-from sqlalchemy.orm import scoped_session, sessionmaker
4	-from sqlalchemy.engine import create_engine	2	+
		3	+
5	from pyramid import config	4	from pyramid import config
		5	+from sqlalchemy.engine import create_engine
6	from paste.deploy.loadwsgi import appconfig	6	from paste.deploy.loadwsgi import appconfig
		7	+from sqlalchemy.ext.declarative import declarative_base
		8	+from sqlalchemy.orm import scoped_session, sessionmaker
		9	+
		10	+def initialize_sql(settings):
7		11
8	-sqlalchemy_url = 'postgresql://cacic:cacic@localhost/cacic'
9	-DBSession = scoped_session(sessionmaker())
10	-Base = declarative_base()
11	-engine = create_engine(sqlalchemy_url)
12	-Session = sessionmaker(bind=engine)
13	-session = Session()	12	+ global DBSession
		13	+ global sqlalchemy_url
		14	+ global DBSession
		15	+ global Base
		16	+ global engine
		17	+ global Session
		18	+ global session
14		19
		20	+ sqlalchemy_url = settings['sqlalchemy.url']
		21	+ DBSession = scoped_session(sessionmaker())
		22	+ Base = declarative_base()
		23	+ engine = create_engine(sqlalchemy_url)
		24	+ Session = sessionmaker(bind=engine)
		25	+ session = Session()
15		26
16	-def initialize_sql(engine):
17	DBSession.configure(bind=engine)	27	DBSession.configure(bind=engine)
18	Base.metadata.bind = engine	28	Base.metadata.bind = engine
19	# Base.metadata.create_all(engine)	29	# Base.metadata.create_all(engine)
		30	+
		31	+
		32	+
		33	+