PYROS-IRAP / pyros

Commit 7200894b598d0e1a6dd4c9db69a348b49d40b552

Authored by Alain Klotz
2 parents d2c6495a 7c370b71
Exists in dev

Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev

Showing 5 changed files with 14 additions and 12 deletions   Show diff stats
Inline Side-by-side
simulators/logconf/logging.ini
  Diff comments   View file @7200894
... ... @@ -2,14 +2,14 @@
2 2 keys=root
3 3  
4 4 [handlers]
5   -keys=fileHandler, consoleHandler
  5 +keys=fileHandler
6 6  
7 7 [formatters]
8 8 keys=simpleFormaters
9 9  
10 10 [logger_root]
11 11 level=DEBUG
12   -handlers=fileHandler, consoleHandler
  12 +handlers=fileHandler
13 13  
14 14 [handler_fileHandler]
15 15 class=logging.handlers.RotatingFileHandler
... ... @@ -20,12 +20,6 @@ encoding=utf8
20 20 formatter=simpleFormaters
21 21 args=('../../logs/guitalens.log', 'a')
22 22  
23   -[handler_consoleHandler]
24   -class=StreamHandler
25   -level=DEBUG
26   -formatter=simpleFormaters
27   -args=(sys.stdout,)
28   -
29 23 [formatter_simpleFormaters]
30 24 format=%(asctime)s - %(module)s:%(name)s:%(lineno)s - %(levelname)s - %(message)s
31 25 datefmt=
... ...
simulators/plc/guitalens_worker.py
  Diff comments   View file @7200894
  1 +"""
  2 +PM 20190108
1 3  
  4 +"""
2 5  
3 6 import logging
4 7 import threading
... ... @@ -10,7 +13,7 @@ import os, sys
10 13 print(os.path.abspath("."))
11 14 _path = os.path.abspath("..")
12 15 sys.path.insert(0, _path )
13   -import logconf
  16 +#import logconf
14 17 logger = logging.getLogger(__name__)
15 18 """logger = logging.getLogger(__name__)
16 19 logging.basicConfig(level=logging.DEBUG, format='%(asctime)s - %(name)s - %(levelname)s - %(message)s')
... ...
simulators/plc/plcSimulator.py
  Diff comments   View file @7200894
1 1 #!/usr/bin/env python3
  2 +"""
2 3  
  4 +MODIFIED:
  5 +PM 20190108
  6 +
  7 +"""
3 8 import os
4 9 import sys
5 10 import json
6 11 import time
7 12 import logging
8   -import urllib.request
  13 +#import urllib.request
9 14  
10 15 DEBUG_FILE = True
11 16 PACKAGE_PARENT = '..'
... ...
src/dashboard/templates/dashboard/reload_weather.html
  Diff comments   View file @7200894
... ... @@ -40,7 +40,7 @@
40 40 {% block content %}
41 41 <div id="page-wrapper" class="row">
42 42 <h1 id="none">Weather info</h1>
43   - Maximum of weather info iteration set: {{iteration}}
  43 + Maximum of weather info iteration set: {{iteration}} Config 10190108
44 44 <div class="row">
45 45 <div id="global" class="container-fluid hbox">
46 46 <h4>Global</h4>
... ...
src/pyros/settings.py
  Diff comments   View file @7200894
... ... @@ -69,7 +69,7 @@ SECRET_KEY = &#39;0*@w)$rq4x1c2w!c#gn58*$*u$w=s8uw2zpr_c3nj*u%qlxc23&#39;
69 69 # SECURITY WARNING: don't run with debug turned on in production!
70 70 DEBUG = True
71 71  
72   -ALLOWED_HOSTS = ['localhost', '127.0.0.1']
  72 +ALLOWED_HOSTS = ['localhost', '127.0.0.1', 'pyros.irap.omp.eu']
73 73  
74 74  
75 75 # Application definition
... ...