Skip to content

iso8583 / iso8583-web

Go to a project
Commit e2ce8700 by Solo Group
Options

change main to app:main

1 parent b53ac09f
Inline Side-by-side
Showing 5 changed files with 30 additions and 27 deletions
iso8583_web/read_conf.py
...@@ -115,6 +115,7 @@ def read_conf(conf_file): ...@@ -115,6 +115,7 @@ def read_conf(conf_file):
cfg['module'] = get_str(conf, section, 'module', 'opensipkd.iso8583.network') cfg['module'] = get_str(conf, section, 'module', 'opensipkd.iso8583.network')
cfg['module_obj'] = get_module_object(cfg['module']) cfg['module_obj'] = get_module_object(cfg['module'])
cfg['module_conf'] = modules cfg['module_conf'] = modules
cfg['ip'] = conf.get(section, 'ip') cfg['ip'] = conf.get(section, 'ip')
cfg['port'] = conf.getint(section, 'port') cfg['port'] = conf.getint(section, 'port')
cfg['listen'] = get_boolean(conf, section, 'listen', True) cfg['listen'] = get_boolean(conf, section, 'listen', True)
...@@ -130,3 +131,5 @@ def read_conf(conf_file): ...@@ -130,3 +131,5 @@ def read_conf(conf_file):
allowed_ips.append(ip) allowed_ips.append(ip)
# print(cfg) # print(cfg)
ip_conf[ip_port] = name_conf[name] = dict(cfg) ip_conf[ip_port] = name_conf[name] = dict(cfg)
return conf
iso8583_web/scripts/forwarder.py
...@@ -601,21 +601,12 @@ except ImportError: ...@@ -601,21 +601,12 @@ except ImportError:
NoOptionError, NoOptionError,
) )
def get_db(conf_file): def get_db(conf):
conf = ConfigParser() if 'app:main' not in conf.sections():
conf.read(conf_file)
if 'main' not in conf.sections():
return return
pool_size = get_int(conf, 'app:main', 'pool_size', 5)
#settings = conf.sections() max_overflow = get_int(conf, 'app:main', 'max_overflow', 10)
#print settings, settings['main'] url = get_str(conf, 'app:main', 'sqlalchemy.url',None)
#if 'sqlalchemy.url' not in settings:
# log_message('SQL URL Not Foune')
# return
pool_size = get_int(conf, 'main', 'pool_size', 5)
max_overflow = get_int(conf, 'main', 'max_overflow', 10)
url = get_str(conf, 'main', 'sqlalchemy.url',None)
if not url: if not url:
return return
...@@ -625,15 +616,22 @@ def get_db(conf_file): ...@@ -625,15 +616,22 @@ def get_db(conf_file):
DBSession.configure(bind=engine) DBSession.configure(bind=engine)
Base.metadata.bind = engine Base.metadata.bind = engine
# session_factory = session_factory_from_settings(settings) # session_factory = session_factory_from_settings(settings)
modules = get_str(conf, 'app:main', 'modules', None)
if modules:
from importlib import import_module
for module in modules.split(','):
m = import_module('.', module)
cfg = dict(conf.items('module'))
m.main(None, **cfg)
def main(argv=sys.argv): def main(argv=sys.argv):
if len(argv) != 2: if len(argv) != 2:
usage(argv) usage(argv)
config_uri = argv[1] config_uri = argv[1]
setup_logging(config_uri) setup_logging(config_uri)
read_conf(config_uri) conf = read_conf(config_uri)
get_db(config_uri) get_db(conf)
log = logging.getLogger(__file__) log = logging.getLogger(__file__)
logs.append(log) logs.append(log)
running.append(True) running.append(True)
......
iso8583_web/scripts/test_inquiry.py
...@@ -8,7 +8,7 @@ from pyramid.paster import setup_logging ...@@ -8,7 +8,7 @@ from pyramid.paster import setup_logging
# import importlib # import importlib
# import imp # import imp
# from .iso8583_forwarder import conf # from .iso8583_forwarder import conf
from .forwarder import logs from .forwarder import logs, get_db
try: try:
from configparser import ( from configparser import (
ConfigParser, ConfigParser,
...@@ -34,10 +34,11 @@ def main(argv=sys.argv): ...@@ -34,10 +34,11 @@ def main(argv=sys.argv):
pars.add_option('-i', '--invoice-id') pars.add_option('-i', '--invoice-id')
pars.add_option('-b', '--bank-id', default='001', help='default Bank Indonesia') pars.add_option('-b', '--bank-id', default='001', help='default Bank Indonesia')
option, remain = pars.parse_args(argv[1:]) option, remain = pars.parse_args(argv[1:])
conf_file = os.path.realpath(option.conf_file)
conf_file = os.path.realpath(option.conf_file)
conf = read_conf(conf_file)
get_db(conf)
read_conf(conf_file)
setup_logging(conf_file) setup_logging(conf_file)
log = logging.getLogger(__file__) log = logging.getLogger(__file__)
logs.append(log) logs.append(log)
...@@ -45,7 +46,7 @@ def main(argv=sys.argv): ...@@ -45,7 +46,7 @@ def main(argv=sys.argv):
conf = ConfigParser() conf = ConfigParser()
conf.read(conf_file) conf.read(conf_file)
localization = get_str(conf, 'main', 'localization', default='id_ID.UTF-8') localization = get_str(conf, 'app:main', 'localization', default='id_ID.UTF-8')
locale.setlocale(locale.LC_ALL, localization) locale.setlocale(locale.LC_ALL, localization)
module_name = 'main' module_name = 'main'
......
iso8583_web/scripts/test_payment.py
...@@ -48,8 +48,8 @@ def main(argv=sys.argv): ...@@ -48,8 +48,8 @@ def main(argv=sys.argv):
conf_file = os.path.realpath(option.conf_file) conf_file = os.path.realpath(option.conf_file)
read_conf(conf_file) conf = read_conf(conf_file)
get_db(conf_file) get_db(conf)
setup_logging(conf_file) setup_logging(conf_file)
log = logging.getLogger(__file__) log = logging.getLogger(__file__)
logs.append(log) logs.append(log)
...@@ -57,7 +57,7 @@ def main(argv=sys.argv): ...@@ -57,7 +57,7 @@ def main(argv=sys.argv):
conf = ConfigParser() conf = ConfigParser()
conf.read(conf_file) conf.read(conf_file)
localization = get_str(conf, 'main', 'localization', default='id_ID.UTF-8') localization = get_str(conf, 'app:main', 'localization', default='id_ID.UTF-8')
locale.setlocale(locale.LC_ALL, localization) locale.setlocale(locale.LC_ALL, localization)
module_name = 'main' module_name = 'main'
......
iso8583_web/scripts/test_reversal.py
...@@ -55,13 +55,14 @@ def main(argv=sys.argv): ...@@ -55,13 +55,14 @@ def main(argv=sys.argv):
pars.add_option('-o', '--host', default=host_name, help='default ' + host_name) pars.add_option('-o', '--host', default=host_name, help='default ' + host_name)
pars.add_option('-i', '--invoice-id') pars.add_option('-i', '--invoice-id')
pars.add_option('-b', '--bank-id', default='001', help='default Bank Indonesia') pars.add_option('-b', '--bank-id', default='001', help='default Bank Indonesia')
pars.add_option('', '--query', action='store_true')
option, remain = pars.parse_args(argv[1:]) option, remain = pars.parse_args(argv[1:])
conf_file = os.path.realpath(option.conf_file) conf_file = os.path.realpath(option.conf_file)
read_conf(conf_file) conf = read_conf(conf_file)
get_db(conf_file) get_db(conf)
setup_logging(conf_file) setup_logging(conf_file)
log = logging.getLogger(__file__) log = logging.getLogger(__file__)
logs.append(log) logs.append(log)
...@@ -69,7 +70,7 @@ def main(argv=sys.argv): ...@@ -69,7 +70,7 @@ def main(argv=sys.argv):
conf = ConfigParser() conf = ConfigParser()
conf.read(conf_file) conf.read(conf_file)
localization = get_str(conf, 'main', 'localization', default='id_ID.UTF-8') localization = get_str(conf, 'app:main', 'localization', default='id_ID.UTF-8')
locale.setlocale(locale.LC_ALL, localization) locale.setlocale(locale.LC_ALL, localization)
module_name = 'main' module_name = 'main'
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!