Skip to content

Commit a2d77c9

Browse files
EzetowersEzetowers
committed
Merge branch 'deployment_refactor'
2 parents 3b75dbc + 70cd501 commit a2d77c9

21 files changed

+810
-528
lines changed

‎MLC/Log/log.py‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,33 @@
2121

2222
import logging
2323
import logging.config
24+
import platform
2425
import os
2526

27+
os_platform = platform.system()
28+
log_file = os.path.join(*[os.path.dirname(os.path.realpath(__file__)),
29+
"..",
30+
"..",
31+
"conf",
32+
"logging.{0}.conf".format(os_platform.lower())])
33+
34+
if not os.path.isfile(log_file):
35+
print "Platform {0} is not supported. Using default logging file.".format(os_platform)
36+
log_file = os.path.join(*[os.path.dirname(os.path.realpath(__file__)),
37+
"..",
38+
"..",
39+
"conf",
40+
"logging.default.conf"])
2641
logger_ = None
27-
logging.config.fileConfig(os.path.dirname(os.path.realpath(__file__)) +
28-
"/../../conf/logging.conf")
42+
logging.config.fileConfig(log_file)
2943

3044

3145
def set_logger(mode):
32-
if mode == "console" or mode == "testing" or \
33-
mode == "root" or mode == "file":
46+
if (mode == "console" or
47+
mode == "testing" or
48+
mode == "root" or
49+
mode == "file"):
50+
3451
global logger_
3552
logger_ = logging.getLogger(mode)
3653

‎conf/logging.darwin.conf‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
[loggers]
2+
keys=testing,console,file,root,gui
3+
4+
[handlers]
5+
keys=consoleHandler,fileHandler,nullHandler,fileHandlerGui
6+
7+
[formatters]
8+
keys=simpleFormatter
9+
10+
[logger_root]
11+
level=DEBUG
12+
handlers=fileHandler
13+
qualname=root
14+
propagate=0
15+
16+
[logger_console]
17+
level=INFO
18+
# handlers=fileHandler
19+
handlers=consoleHandler
20+
qualname=console
21+
propagate=0
22+
23+
[logger_file]
24+
level=DEBUG
25+
handlers=fileHandler
26+
qualname=file
27+
propagate=0
28+
29+
[logger_testing]
30+
handlers=nullHandler
31+
qualname=testing
32+
propagate=0
33+
34+
[logger_gui]
35+
level=DEBUG
36+
handlers=fileHandlerGui
37+
qualname=gui
38+
propagate=0
39+
40+
[logger_simpleExample]
41+
level=DEBUG
42+
handlers=consoleHandler
43+
qualname=simpleExample
44+
propagate=0
45+
46+
[handler_consoleHandler]
47+
class=StreamHandler
48+
level=DEBUG
49+
formatter=simpleFormatter
50+
args=(sys.stdout,)
51+
52+
[handler_nullHandler]
53+
class=FileHandler
54+
level=DEBUG
55+
formatter=simpleFormatter
56+
args=('null',)
57+
filemode=a
58+
59+
[handler_fileHandler]
60+
class=FileHandler
61+
level=DEBUG
62+
formatter=simpleFormatter
63+
args=('mlc.log',)
64+
filemode=a
65+
66+
[handler_fileHandlerGui]
67+
class=FileHandler
68+
level=DEBUG
69+
formatter=simpleFormatter
70+
args=('mlc_gui.log',)
71+
filemode=a
72+
73+
[formatter_simpleFormatter]
74+
format=%(asctime)s - %(levelname)s - %(message)s
75+
# format=%(levelname)s - %(message)s
76+
datefmt=

conf/logging.conf renamed to conf/logging.default.conf

File renamed without changes.

‎conf/logging.linux.conf‎

Lines changed: 152 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
[loggers]
2+
keys=testing,console,file,root,gui
3+
4+
[handlers]
5+
keys=consoleHandler,fileHandler,nullHandler,fileHandlerGui
6+
7+
[formatters]
8+
keys=simpleFormatter
9+
10+
[logger_root]
11+
level=DEBUG
12+
handlers=fileHandler
13+
qualname=root
14+
propagate=0
15+
16+
[logger_console]
17+
level=INFO
18+
# handlers=fileHandler
19+
handlers=consoleHandler
20+
qualname=console
21+
propagate=0
22+
23+
[logger_file]
24+
level=DEBUG
25+
handlers=fileHandler
26+
qualname=file
27+
propagate=0
28+
29+
[logger_testing]
30+
handlers=nullHandler
31+
qualname=testing
32+
propagate=0
33+
34+
[logger_gui]
35+
level=DEBUG
36+
handlers=fileHandlerGui
37+
qualname=gui
38+
propagate=0
39+
40+
[logger_simpleExample]
41+
level=DEBUG
42+
handlers=consoleHandler
43+
qualname=simpleExample
44+
propagate=0
45+
46+
[handler_consoleHandler]
47+
class=StreamHandler
48+
level=DEBUG
49+
formatter=simpleFormatter
50+
args=(sys.stdout,)
51+
52+
[handler_nullHandler]
53+
class=FileHandler
54+
level=DEBUG
55+
formatter=simpleFormatter
56+
args=('/dev/null',)
57+
filemode=a
58+
59+
[handler_fileHandler]
60+
class=FileHandler
61+
level=DEBUG
62+
formatter=simpleFormatter
63+
args=('/tmp/mlc.log',)
64+
filemode=a
65+
66+
[handler_fileHandlerGui]
67+
class=FileHandler
68+
level=DEBUG
69+
formatter=simpleFormatter
70+
args=('/tmp/mlc_gui.log',)
71+
filemode=a
72+
73+
[formatter_simpleFormatter]
74+
format=%(asctime)s - %(levelname)s - %(message)s
75+
# format=%(levelname)s - %(message)s
76+
datefmt=
77+
[loggers]
78+
keys=testing,console,file,root,gui
79+
80+
[handlers]
81+
keys=consoleHandler,fileHandler,nullHandler,fileHandlerGui
82+
83+
[formatters]
84+
keys=simpleFormatter
85+
86+
[logger_root]
87+
level=DEBUG
88+
handlers=fileHandler
89+
qualname=root
90+
propagate=0
91+
92+
[logger_console]
93+
level=INFO
94+
# handlers=fileHandler
95+
handlers=consoleHandler
96+
qualname=console
97+
propagate=0
98+
99+
[logger_file]
100+
level=DEBUG
101+
handlers=fileHandler
102+
qualname=file
103+
propagate=0
104+
105+
[logger_testing]
106+
handlers=nullHandler
107+
qualname=testing
108+
propagate=0
109+
110+
[logger_gui]
111+
level=DEBUG
112+
handlers=fileHandlerGui
113+
qualname=gui
114+
propagate=0
115+
116+
[logger_simpleExample]
117+
level=DEBUG
118+
handlers=consoleHandler
119+
qualname=simpleExample
120+
propagate=0
121+
122+
[handler_consoleHandler]
123+
class=StreamHandler
124+
level=DEBUG
125+
formatter=simpleFormatter
126+
args=(sys.stdout,)
127+
128+
[handler_nullHandler]
129+
class=FileHandler
130+
level=DEBUG
131+
formatter=simpleFormatter
132+
args=('/dev/null',)
133+
filemode=a
134+
135+
[handler_fileHandler]
136+
class=FileHandler
137+
level=DEBUG
138+
formatter=simpleFormatter
139+
args=('/tmp/mlc.log',)
140+
filemode=a
141+
142+
[handler_fileHandlerGui]
143+
class=FileHandler
144+
level=DEBUG
145+
formatter=simpleFormatter
146+
args=('/tmp/mlc_gui.log',)
147+
filemode=a
148+
149+
[formatter_simpleFormatter]
150+
format=%(asctime)s - %(levelname)s - %(message)s
151+
# format=%(levelname)s - %(message)s
152+
datefmt=

‎conf/logging.windows.conf‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
[loggers]
2+
keys=testing,console,file,root,gui
3+
4+
[handlers]
5+
keys=consoleHandler,fileHandler,nullHandler,fileHandlerGui
6+
7+
[formatters]
8+
keys=simpleFormatter
9+
10+
[logger_root]
11+
level=DEBUG
12+
handlers=fileHandler
13+
qualname=root
14+
propagate=0
15+
16+
[logger_console]
17+
level=INFO
18+
# handlers=fileHandler
19+
handlers=consoleHandler
20+
qualname=console
21+
propagate=0
22+
23+
[logger_file]
24+
level=DEBUG
25+
handlers=fileHandler
26+
qualname=file
27+
propagate=0
28+
29+
[logger_testing]
30+
handlers=nullHandler
31+
qualname=testing
32+
propagate=0
33+
34+
[logger_gui]
35+
level=DEBUG
36+
handlers=fileHandlerGui
37+
qualname=gui
38+
propagate=0
39+
40+
[logger_simpleExample]
41+
level=DEBUG
42+
handlers=consoleHandler
43+
qualname=simpleExample
44+
propagate=0
45+
46+
[handler_consoleHandler]
47+
class=StreamHandler
48+
level=DEBUG
49+
formatter=simpleFormatter
50+
args=(sys.stdout,)
51+
52+
[handler_nullHandler]
53+
class=FileHandler
54+
level=DEBUG
55+
formatter=simpleFormatter
56+
args=('/dev/null',)
57+
filemode=a
58+
59+
[handler_fileHandler]
60+
class=FileHandler
61+
level=DEBUG
62+
formatter=simpleFormatter
63+
args=('/tmp/mlc.log',)
64+
filemode=a
65+
66+
[handler_fileHandlerGui]
67+
class=FileHandler
68+
level=DEBUG
69+
formatter=simpleFormatter
70+
args=('/tmp/mlc_gui.log',)
71+
filemode=a
72+
73+
[formatter_simpleFormatter]
74+
format=%(asctime)s - %(levelname)s - %(message)s
75+
# format=%(levelname)s - %(message)s
76+
datefmt=

‎tools/installer/Dockerfiles/README‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# First generate the OS image with the following command
2+
docker build -f ubuntu1604.dockerfile -t mlc_ubuntu:16.04 --build-arg RELEASE=0.0.2 .
3+
4+
# Then get the .tar.gz related with the OS running the docker container
5+
docker run --rm -it mlc_ubuntu:16.04 bash

0 commit comments

Comments
 (0)