config: use from_json to read ogserver config

This patch introduces the usage of Flask.Config class so the config can
be read at startup (__init__) only once. Config keys must be uppercase
so that from_json method does take it into account.

 dormousehole.readthedocs.io/en/stable/api.html#flask.Config.from_json

Prior to this patch each request required opening and closing the
ogserver.json file via load_config in views.py.

In the future the decorated load_config function inside views.py
may be removed to avoid creating multiple instances of the OGServer
class.

1 files changed, 5 insertions, 10 deletions

diff --git a/ogcp/og_server.py b/ogcp/og_server.py
index 08c9b08..2ea0363 100644
--- a/ogcp/og_server.py
+++ b/ogcp/og_server.py
@@ -1,22 +1,17 @@
+from ogcp import app
+
 import requests
 import json
 
 class OGServer:
-    def __init__(self, ip='127.0.0.1', port=8888, api_token=""):
+    def __init__(self, ip=app.config['IP'],
+                 port=app.config['PORT'],
+                 api_token=app.config['API_TOKEN']):
         self.ip = ip
         self.port = port
         self.api_token = api_token
         self._prepare_requests()
 
-    def load_config(self, path):
-        with open(path, 'r') as f:
-            cfg = json.load(f)
-
-        self.ip = cfg['ip']
-        self.port = cfg['port']
-        self.api_token = cfg['api_token']
-        self._prepare_requests()
-
     def _prepare_requests(self):
         self.URL = f'http://{self.ip}:{self.port}'
         self.HEADERS = {'Authorization' : self.api_token}