From eda61cdfcd7e6fff12677ac37ab4875a8830ae80 Mon Sep 17 00:00:00 2001 From: Christophe Siraut Date: Sat, 22 Sep 2018 14:33:23 +0200 Subject: [PATCH] use bijoe connection parameters (#26631) --- wcs_olap/cmd.py | 11 +++++------ wcs_olap/feeder.py | 5 ++--- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/wcs_olap/cmd.py b/wcs_olap/cmd.py index 50928e8..b065882 100644 --- a/wcs_olap/cmd.py +++ b/wcs_olap/cmd.py @@ -8,6 +8,8 @@ from . import wcs_api from .feeder import WcsOlapFeeder import locale +from django.db import connection + from . import tb @@ -74,10 +76,9 @@ def main2(): parser.add_argument('--orig', help='origin of the request for signatures') parser.add_argument('--slug', action='append', default=[]) parser.add_argument('--key', help='HMAC key for signatures') - parser.add_argument('--pg-dsn', help='Psycopg2 DB DSN') parser.add_argument('--schema', help='schema name') args = parser.parse_args() - for key in ('orig', 'key', 'pg_dsn', 'schema', 'batch_size'): + for key in ('orig', 'key', 'schema', 'batch_size'): if getattr(args, key, None): defaults[key] = getattr(args, key) @@ -92,7 +93,6 @@ def main2(): key = defaults['key'] orig = defaults['orig'] schema = defaults['schema'] - pg_dsn = defaults['pg_dsn'] slugs = defaults.get('slugs', '').strip().split() or getattr(args, 'slug', []) batch_size = int(defaults.get('batch_size', 1000)) except KeyError, e: @@ -103,9 +103,8 @@ def main2(): api = wcs_api.WcsApi(url=url, orig=orig, key=key, slugs=slugs, verify=defaults.get('verify', 'True') == 'True', batch_size=batch_size) - logger.info('starting synchronizing w.c.s. at %r with PostgreSQL at %s', url, - pg_dsn) - feeder = WcsOlapFeeder(api=api, schema=schema, pg_dsn=pg_dsn, logger=logger, + logger.info('starting synchronizing w.c.s. at %r', url) + feeder = WcsOlapFeeder(api=api, schema=schema, connection=connection, logger=logger, config=defaults, do_feed=feed, fake=fake) feeder.feed() logger.info('finished') diff --git a/wcs_olap/feeder.py b/wcs_olap/feeder.py index 2ef0008..7d252e5 100644 --- a/wcs_olap/feeder.py +++ b/wcs_olap/feeder.py @@ -5,7 +5,6 @@ import os import json import hashlib from utils import Whatever -import psycopg2 from wcs_olap.wcs_api import WcsApiError @@ -43,12 +42,12 @@ class Context(object): class WcsOlapFeeder(object): - def __init__(self, api, pg_dsn, schema, logger=None, config=None, do_feed=True, fake=False): + def __init__(self, api, connection, schema, logger=None, config=None, do_feed=True, fake=False): self.api = api self.fake = fake self.logger = logger or Whatever() self.schema = schema - self.connection = psycopg2.connect(dsn=pg_dsn) + self.connection = connection self.connection.autocommit = True self.cur = self.connection.cursor() self.formdefs = api.formdefs -- 2.11.0