moving some configuration values into settings file
parent
294dc70774
commit
032563c85d
|
@ -22,6 +22,10 @@ config = {
|
||||||
"server_host": "127.0.0.1",
|
"server_host": "127.0.0.1",
|
||||||
"server_port": "3333",
|
"server_port": "3333",
|
||||||
"server_path": "login_callback",
|
"server_path": "login_callback",
|
||||||
|
|
||||||
|
# preferences
|
||||||
|
"days_of_history": 1,
|
||||||
|
"log_level": "INFO"
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
28
app.py
28
app.py
|
@ -15,11 +15,6 @@ from io import BytesIO
|
||||||
import logging
|
import logging
|
||||||
logger = logging.getLogger()
|
logger = logging.getLogger()
|
||||||
|
|
||||||
#logger.setLevel('DEBUG')
|
|
||||||
logger.setLevel('INFO')
|
|
||||||
#logger.setLevel('WARN')
|
|
||||||
#logger.setLevel('ERROR')
|
|
||||||
#logger.setLevel('CRITICAL')
|
|
||||||
|
|
||||||
from EagleEyev3 import *
|
from EagleEyev3 import *
|
||||||
from settings import config
|
from settings import config
|
||||||
|
@ -33,6 +28,26 @@ SESSION_TYPE = 'filesystem'
|
||||||
app.config.from_object(__name__)
|
app.config.from_object(__name__)
|
||||||
Session(app)
|
Session(app)
|
||||||
|
|
||||||
|
|
||||||
|
# check if it could pull in a config object from settings.py
|
||||||
|
if config:
|
||||||
|
# start checking for keys in config object and set sensible defaults
|
||||||
|
if 'days_of_history' in config:
|
||||||
|
DAYS_OF_HISTORY = config['days_of_history']
|
||||||
|
else:
|
||||||
|
# fallback to a sane default
|
||||||
|
DAYS_OF_HISTORY = 1
|
||||||
|
else:
|
||||||
|
if 'log_level' in config:
|
||||||
|
logger.setLevel(config['log_level'])
|
||||||
|
else:
|
||||||
|
logging.setLevel(config['INFO'])
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@app.route('/')
|
@app.route('/')
|
||||||
def index():
|
def index():
|
||||||
|
|
||||||
|
@ -161,7 +176,8 @@ def camera_detail(esn=None):
|
||||||
camera = een.get_camera_by_id(esn)
|
camera = een.get_camera_by_id(esn)
|
||||||
now = een.time_now()
|
now = een.time_now()
|
||||||
|
|
||||||
for i in tqdm(range(0,4)):
|
# because of API limitation, can only query 6 hours max
|
||||||
|
for i in tqdm(range(0, DAYS_OF_HISTORY * 4)):
|
||||||
camera.get_list_of_events(end_timestamp=een.time_before(ts=now, hours=6*i), \
|
camera.get_list_of_events(end_timestamp=een.time_before(ts=now, hours=6*i), \
|
||||||
start_timestamp=een.time_before(ts=now, hours=6*(i+1)))
|
start_timestamp=een.time_before(ts=now, hours=6*(i+1)))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue