From a3c2d85fd6e8326e16dc3d92a60a2ab2bb2515f5 Mon Sep 17 00:00:00 2001
From: "Kevin S. Hahn" <kevinshahn@gmail.com>
Date: Wed, 25 Feb 2015 14:45:54 -0800
Subject: [PATCH] rename internimsclient to centralclient
---
api.py | 4 ++--
api.wsgi | 10 +++++-----
internimsclient.py => centralclient.py | 12 ++++++------
3 files changed, 13 insertions(+), 13 deletions(-)
rename internimsclient.py => centralclient.py (92%)
diff --git a/api.py b/api.py
index 055d728b..8c70d4c8 100755
--- a/api.py
+++ b/api.py
@@ -139,9 +139,9 @@ if __name__ == '__main__':
app.config['demo'] = args.demo
if not app.config['ssl_cert']:
- log.warning('SSL certificate not specified, interNIMS functionality disabled')
+ log.warning('SSL certificate not specified, scitran central functionality disabled')
elif not app.config['site_id']:
- log.warning('site_id not configured, interNIMS functionality disabled')
+ log.warning('site_id not configured, scitran central functionality disabled')
if not os.path.exists(app.config['data_path']):
os.makedirs(app.config['data_path'])
diff --git a/api.wsgi b/api.wsgi
index 8ac1025e..ab11d6d7 100644
--- a/api.wsgi
+++ b/api.wsgi
@@ -8,7 +8,7 @@ import argparse
import uwsgidecorators
import api
-import internimsclient
+import centralclient
os.environ['PYTHON_EGG_CACHE'] = '/tmp/python_egg_cache'
os.umask(0o022)
@@ -78,13 +78,13 @@ else:
fail_count = 0
@uwsgidecorators.timer(60)
- def internimsclient_timer(signum):
+ def centralclient_timer(signum):
global fail_count
- if not internimsclient.update(application.db, args.api_uri, args.site_name, args.site_id, args.ssl_cert, args.central_uri):
+ if not centralclient.update(application.db, args.api_uri, args.site_name, args.site_id, args.ssl_cert, args.central_uri):
fail_count += 1
else:
fail_count = 0
if fail_count == 3:
- log.debug('InterNIMS unreachable, purging all remotes info')
- internimsclient.clean_remotes(application.db)
+ log.debug('scitran central unreachable, purging all remotes info')
+ centralclient.clean_remotes(application.db)
diff --git a/internimsclient.py b/centralclient.py
similarity index 92%
rename from internimsclient.py
rename to centralclient.py
index 86a11885..66ce9aab 100755
--- a/internimsclient.py
+++ b/centralclient.py
@@ -12,7 +12,7 @@ local users are permitted to access data in other instances.
import logging
import logging.config
logging.basicConfig()
-log = logging.getLogger('internims')
+log = logging.getLogger('centralclient')
logging.getLogger('requests').setLevel(logging.WARNING) # silence Requests library logging
import re
@@ -20,7 +20,7 @@ import json
import requests
-def update(db, api_uri, site_name, site_id, ssl_cert, internims_url):
+def update(db, api_uri, site_name, site_id, ssl_cert, central_url):
"""Send is-alive signal to central peer registry."""
proj_userlist = [p['permissions'] for p in db.projects.find(None, {'_id': False, 'permissions._id': True, 'permissions.site': True})]
col_userlist = [c['permissions'] for c in db.collections.find(None, {'_id': False, 'permissions._id': True, 'permissions.site': True})]
@@ -31,7 +31,7 @@ def update(db, api_uri, site_name, site_id, ssl_cert, internims_url):
payload = json.dumps({'_id': site_id, 'api_uri': api_uri, 'users': remote_users, 'name': site_name})
try:
- r = requests.post(internims_url, data=payload, cert=ssl_cert)
+ r = requests.post(central_url, data=payload, cert=ssl_cert)
except requests.exceptions.ConnectionError:
log.debug('SDMC is not reachable')
else:
@@ -87,7 +87,7 @@ if __name__ == '__main__':
import argparse
arg_parser = argparse.ArgumentParser()
- arg_parser.add_argument('--internims_url', help='Scitran Central API URL', default='https://sdmc.scitran.io')
+ arg_parser.add_argument('--central_url', help='Scitran Central API URL', default='https://sdmc.scitran.io')
arg_parser.add_argument('--db_uri', help='DB URI', required=True)
arg_parser.add_argument('--api_uri', help='API URL, without http:// or https://', required=True)
arg_parser.add_argument('--site_id', help='instance hostname (used as unique ID)', required=True)
@@ -106,11 +106,11 @@ if __name__ == '__main__':
fail_count = 0
while True:
- if not update(db, args.api_uri, args.site_name, args.site_id, args.ssl_cert, args.internims_url):
+ if not update(db, args.api_uri, args.site_name, args.site_id, args.ssl_cert, args.central_url):
fail_count += 1
else:
fail_count = 0
if fail_count == 3:
- log.debug('InterNIMS unreachable, purging all remotes info')
+ log.debug('scitran central unreachable, purging all remotes info')
clean_remotes(db)
time.sleep(args.sleeptime)
--
GitLab