%$KYC7en=ʒQ9HxR%c /vHu\2;gեʑzEo(WQ᳇fꞪ ]C陒9.VRg1+ qŴ3MC} h(={E^0rKkz[XCo.1 ľ MVM[ - ;o܃J`:.'?]%R9\&J-=WZr!P8(JMC2O3w(ÍkCivtDGB46`\25g[U|yQ?WM;'X^\A}8{=46bH;ĞorDW@Ygxz(RDJ)L:;e، 2evk `З;9%oG?
^T=9@ wڗ/6pBN>f|~u|k5śۍٟ[OOV`s;m(tOSE:08s&tI`DXg~DBsU@$:h*L6uBJ |(UHqTk eUkt[te{BKCUS!H_I$1T(^>#ղ 9npV@l0Vi ]ޯDԐ(W8MPhb3l w,F2+YTϬ$ 8 H\2.Ȍ_1A&t^$VQ$fr!`
ϑDP#m
7v+1$z,j ~9@jw6$g?U|)_[c$!E
wi0km%ʎ. _p>LynF0&l׃{cH5UGst(
+&0;,^ 5 '9 A@ i"w>8JX$1h^5 EsEg6lk 'ZXHLYB cL;ُ/07j]&isE^hְ.]nVƅ p^=X.=Ti.长Jx|F(:u- Igt^KݎR6^fH^_.?Oz{jP̃Z\?4XrOn8_a 5Sbn5|7?y\Vf;S\2gΚ$[h [\ f%Mxo2k
ſ|+ޟ͠nu%XڷO@ |FOBY'OBaխSTk%,4 =] wU] ןW:yCoKtV>9ѹF:g?
7~oq^۬}_G`U6Jʻ~T5/V5aPkg# WcɿN;j_h!f]K??%xcܭu>] e<k2_lMכbkLRt0~9h)fdU 4t_;n^Bq' *Tndu4G;nRJ&@I[y]|j(|?v6袛l0~'߿29!j s'j~勿S_X}|DJQ |/5.gҥ<֘Lb sohK4UU,^iWKUtM UsmSrh zt& 'T>
+TJ;w' έb%K25H=Dnb,*/ n p~z܈Uxvx?d~=mJ7W6{̨ڻ]7Sv 7V/aGq"\ʹrxI;dնhAP
'Dduq7NĄ_;B[g~NznoU;eg@^cxNSJʹf -v{ID8 `dv"aZSOA,gj^a:YPJ'Kk"`'Q/ݾnf&{6 Dfa v^" uF^FBy?`"|Z& iNUCjJS{V:yD}{Ч;c2,t Kx~j>f gwail/6N&"kRHJh+W=s:c@gyv6q}6~Zk-xw*ie!?5&" nu '3ge,̤ 8M Z܆GJ-~廏80ѝYq xr jzqc]WV=)X,upMm+i nE}!{uOunl]Xx8hZ~H;`]N:>5 ᴡ\rbmmF?hſN&"T@H7fA=iCw"Te&<m+l<sq
́;AE2gtLe03TF&`QUei8e N ؾ; ZIg-[~(q[{lz A`:N5C(0ن0ho8ug-G߲m8 ӫ4<ª(?-
F!6O`P_{io-` [ g9MI AeA 5m0h5
uF{a"lʇ<E:SxGRd"f)^+vbp, }E K E7 RHug-\Wref5ٳdC?ɔ|`'4g?nP/ a\KΓ~WVdY1 $
+ qKu)80#qƘNh m.nܕ Eݢc33%XGcآ,O,N$rr>b; uU4܉H YWa^SVB)/ގm'+1w{72vGh"cUՠ++EGj ![LU0mDfs ЖOSTYrᤔ!W]gI8 0\ &n&ͮ[35/KPC$O25Ukaq/ӍU'LӒ; nċnv/F掫ݞ+/rH ljᬗL_c0W'?>L`9
"I/fG+TJuYb!E1۾ݥD ^v@eyAUs{rd8Ǒ$xE.qc!<5 oը:c7]X%Otp
+6XF/
#퍃}.4&G#\hᤗl6@''`59į|9 M &BU |֧RhHHn&>GeIkiNjM'd0OvDX ģ[d8bD*u!qN"sb55]JypRK@H߅&wp'n\6m^_U'I)̣0S&d76ܞ8VN1 \{j^h-MMSk ijl{vT ODT@,+E ⦸' I/o ŻY47H3 FL V}˶zZ lMYgVuǺg=aWT;^`gl{/Nv;MN7Ż d(ކ cx Z)vwDX|:
U+.To=w=E+JW*|uĮz~:Pzuu˪z8 %Cz˞ A[EUWgN6x4x'{nZA˗tJڔvgsG~5Nruqǻܱw; J[ݽݽ@^%/|u VgWqeU$/hh^Q}
+] y?ț~n˪ -s=> 5
T淕 J@ͷ T4M
`Ǣ%8pMa_'fc7g6j5{ p&O ĝx ?&$~)F"@ oi t S#8_FQ ƏKMI~\*cF'JLŎ 1|XLdžD
a6ɒ(0phnEOqR6{5 0[W`*+nMi VLo?uY^C[@r/ |>X^lqq{<yyXKbx^zטk|IwuݺL+s*fP|kݚkѵ[t\zk.
[:\_|_,wk PHb3k\˗k X^_l p\: ο^/0_js.r-7WjָνowjW5~q,> 5r|zqE +X̫MW[`+n73@Woqo"}oG6Х"SizSyy'^ݖzJ+Qs
+l|D!Xurq /p͛5; E(:> f|ffj4_Ks7oܸ1W`!n%B
+ytbd.[\Ђ0KڬhvvzZ/no` gbgDL{56 "S?^=L헟7b(n =vvooE]^s.E6`-H. )H xq]]Y-֗WaW$Dm/o/j|ϿZ^ 9 \c[W ]Okp-bÂ}y <Ë׀/vr~qnޓf_ !wa_e$7~mo~yeA{X 8MO | -~xrufWDƷpr`~{?|t
+$p9wX]7_X;\o.X ~fPk?nu%.O7W5Mo0Gb[ ?IHuOG
-
-
-
-
-
\ No newline at end of file
diff --git a/stuff/webui_design/edit.png b/stuff/webui_design/edit.png
deleted file mode 100755
index 3ef2fa6..0000000
Binary files a/stuff/webui_design/edit.png and /dev/null differ
diff --git a/stuff/webui_design/main.css b/stuff/webui_design/main.css
deleted file mode 100644
index 1c346f3..0000000
--- a/stuff/webui_design/main.css
+++ /dev/null
@@ -1,218 +0,0 @@
-html {
- background-color: #a0a0a0;
-}
-
-/*button {
- text-decoration: none;
- border-radius: 0px;
- font-size: 15px;
- background: #42991d;
- color: white;
- padding: 5px 10px 5px 10px;
- font-family: Arial;
-}*/
-
-span {
- color: white;
- font-size: 50px;
- font-style: italic;
- position: absolute;
- margin-top: 6px;
- margin-left: 20px;
- /*top: 50%;
- transform: translateY(-50%);*/
-}
-
-footer p{
- color: white;
-/* border: 1px solid black;*/
- margin-top: 5px;
-}
-
-footer {
- font-size: 12px;
-/* background-color: green;*/
- background: linear-gradient(to bottom, #006600 20%, #008800 80%);
- height: 20px;
- bottom: 0;
- position: fixed;
- width: 900px; /*same as body width*/
- text-align: center;
-}
-
-table {
- width: 600px;
- border-collapse: collapse;
- border-spacing: 0;
-}
-
-td, th {
- border: 1px solid transparent;
- height: 30px;
- transition: all 0.3s;
-}
-
-th {
- background: #DFDFDF;
- font-weight: bold;
- height: 35px;
-}
-
-td {
- text-align: center;
-}
-
-tr:nth-child(even) td { background: #FEFEFE; }
-tr:nth-child(odd) td { background: #F1F1F1; }
-
-body {
- width: 900px;
- margin: 0 auto;
- font-family: Helvetica, Arial, sans-serif;
- background: white;
- box-shadow: -5px 0 5px -5px, 5px 0 5px -5px;
-}
-
-#nav {
- background: linear-gradient(to bottom, #006600 20%, #008800 80%);
-}
-
-#nav select {
- display: none;
-}
-
-#main {
- padding: 0px 40px;
- margin-bottom: 20px;
- height: 100%;
-}
-
-.tabrow {
- text-align: center;
- list-style: none;
- margin: 0;
- padding: 0;
- line-height: 24px;
- position: relative;
-}
-
-.tabrow:after {
- position: absolute;
- content: "";
- width: 100%;
- bottom: 0;
- left: 0;
- border-bottom: 1px solid #e0e0e0; /*Bottom line */
- z-index: 1;
-}
-
-.tabrow:before {
- z-index: 1;
-}
-
-.tabrow li:before,
-.tabrow li:after {
- position: absolute;
- bottom: 1px;
- width: 6px;
- height: 6px;
- content: "";
-}
-
-.tabrow li:before {
- left: -6px;
- border-bottom-right-radius: 6px;
- border-width: 0 1px 1px 0;
- box-shadow: 2px 2px 0 #e0e0e0;
-}
-.tabrow li:after {
- right: -6px;
- border-bottom-left-radius: 6px;
- border-width: 0 0 1px 1px;
- box-shadow: -2px 2px 0 #e0e0e0;
-}
-.tabrow li.selected:before {
- box-shadow: 2px 2px 0 #ffffff;
-}
-.tabrow li.selected:after {
- box-shadow: -2px 2px 0 #ffffff;
-}
-
-/*.tabrow li:after, .tabrow li:before {
- border: 1px solid #000000
-}*/
-
-.tabrow li {
- margin: 60 0 0 0px;
- padding: 3 11px;
- border: 1px solid #AAA;
- background: #e0e0e0;
- /*background: linear-gradient(to bottom, #e0e0e0 80%, #606060 100%);*/
-/* text-shadow: 0 1px #22; /* dunkelgrauer schatten beim text */
- display: inline-block;
- position: relative;
- z-index: 0;
- border-top-left-radius: 6px;
- border-top-right-radius: 6px;
-}
-
-.tabrow li.selected {
- background: #ffffff;
- color: #000000;
- z-index: 2;
- border-bottom-color: #FFF;
-}
-
-.tabrow li a {
- color: #505050;
- text-decoration: none;
- font-size: 16;
- font-weight: bold;
-}
-
-@media only screen and (max-device-width: 700px) {
- body {
- background-color: #fcfcfc;
- }
-
- #nav ul {
- display: none;
- }
-
-/* #nav select {
- display: block;
- width: 40%;
- margin: auto;
- }*/
-
- span{
- position: relative;
- align-content: center;
- color: white;
- margin-top: 10px;
- margin-left: 10px;
- }
-
- select {
- display: block;
- width: 70%;
- height: 50px;
- font-size: 20px;
- }
-
- button {
- margin-top: 30px;
- width: 70%;
- height: 40px;
-
- }
-
- #main {
- padding: 0px 40px;
- margin-bottom: 20px;
- height: 100%;
-}
-
-
-
-}
\ No newline at end of file
diff --git a/stuff/webui_design/main.html b/stuff/webui_design/main.html
deleted file mode 100644
index f3f560e..0000000
--- a/stuff/webui_design/main.html
+++ /dev/null
@@ -1,53 +0,0 @@
-
-
- Setup Activation
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/stuff/webui_design/minus-button.png b/stuff/webui_design/minus-button.png
deleted file mode 100755
index 6dc019a..0000000
Binary files a/stuff/webui_design/minus-button.png and /dev/null differ
diff --git a/stuff/webui_design/plus-button.png b/stuff/webui_design/plus-button.png
deleted file mode 100755
index 10d1f60..0000000
Binary files a/stuff/webui_design/plus-button.png and /dev/null differ
diff --git a/tools/action.py b/tools/action.py
index 3638c7f..cb89690 100644
--- a/tools/action.py
+++ b/tools/action.py
@@ -1,12 +1,21 @@
import abc
+import logging
+from tools import utils
class Action(object):
- def __init__(self, id, params):
+ def __init__(self, id, params, worker):
self.id = id
self.params = params
self.corrupted = False
-
+ self.worker = worker
+
+ def post_log(self, msg, lvl):
+ self.worker.post_log(msg, lvl)
+
+ def post_err(self, msg):
+ self.worker.post_err(msg)
+
@abc.abstractmethod
def execute(self):
"""Do some stuff.
diff --git a/tools/sensor.py b/tools/sensor.py
index 6170435..55fe375 100644
--- a/tools/sensor.py
+++ b/tools/sensor.py
@@ -1,4 +1,5 @@
import abc
+import logging
class Sensor(object):
@@ -11,6 +12,12 @@ def __init__(self, id, params, worker):
def alarm(self, message):
self.worker.alarm(self.id, message)
+ def post_log(self, msg, lvl):
+ self.worker.post_log(msg, lvl)
+
+ def post_err(self, msg):
+ self.worker.post_err(msg)
+
@abc.abstractmethod
def activate(self):
"""Activate the sensor."""
diff --git a/webinterface/main.py b/webinterface/main.py
index 63f7807..0c581ba 100644
--- a/webinterface/main.py
+++ b/webinterface/main.py
@@ -115,13 +115,21 @@ def connect(self, num_tries=3):
self.channel = self.connection.channel()
connected = True
cherrypy.log("Connection to rabbitmq service established")
- #except pika.exceptions.AMQPConnectionError as pe:
+ break
+ except pika.exceptions.AMQPConnectionError as pe:
+ if "The AMQP connection was closed" in repr(pe):
+ cherrypy.log("Wasn't able to connect to the rabbitmq service, please check if the rabbitmq service is reachable and running")
+ else:
+ cherrypy.log("Wasn't able to connect to the rabbitmq service: %s" % repr(pe))
except Exception as e:
- cherrypy.log("Error connecting to Queue! %s" % e, traceback=True)
- num_tries-=1
+ cherrypy.log("Unknown error: %s" % e)
+
+ num_tries-=1
+ if(num_tries!=0):
time.sleep(30)
if not connected:
+ cherrypy.log("Wasn't able to connect to rabbitmq service, exiting...")
return False
# define exchange
self.channel.exchange_declare(exchange=utils.EXCHANGE, exchange_type='direct')
@@ -188,89 +196,119 @@ def change_credentials(self):
@cherrypy.expose
@cherrypy.tools.json_in()
- @cherrypy.tools.json_out(handler=utils.json_handler)
- def activate(self):
- if(hasattr(cherrypy.request, 'json')):
+ #@cherrypy.tools.json_out(handler=utils.json_handler)
+ def activate(self, **kwargs):
+ retval = {}
+ is_json = False
+ id=0
+
+ if(hasattr(cherrypy.request, 'json')):
id = cherrypy.request.json['id']
+ is_json = True
+ elif('id' in kwargs):
+ id = kwargs['id']
+ else:
+ retval = {'status': 'error', 'message': 'No data recieved!'}
- if(id and id > 0):
- su = self.db.query(objects.Setup).get(int(id))
- try:
- if(hasattr(self, "channel")):
- su.active_state = True
- self.db.commit()
- ooff = { 'active_state': True , 'setup_name': su.name }
- self.channel.basic_publish(exchange=utils.EXCHANGE, routing_key=utils.QUEUE_ON_OFF, body=json.dumps(ooff))
- else:
- return {'status':'error', 'message': "Error activating %s! No connection to queue server!" % su.name }
-
- except pika.exceptions.ConnectionClosed:
- cherrypy.log("Reconnecting to RabbitMQ Server!")
- reconnected = self.connect(5)
- if reconnected:
- cherrypy.log("Reconnect finished!")
- su.active_state = True
- self.db.commit()
- ooff = { 'active_state': True, 'setup_name': su.name }
- self.channel.basic_publish(exchange=utils.EXCHANGE, routing_key=utils.QUEUE_ON_OFF, body=json.dumps(ooff))
- return {'status': 'success', 'message': "Activated setup %s!" % su.name}
- else:
- return {'status':'error', 'message': "Error activating %s! Wasn't able to reconnect!" % su.name }
-
- except Exception as e:
- su.active_state = False
+ if(id and id > 0):
+ su = self.db.query(objects.Setup).get(int(id))
+ try:
+ if(hasattr(self, "channel")):
+ su.active_state = True
self.db.commit()
- cherrypy.log("Error activating! %s"%str(e), traceback=True)
- return {'status':'error', 'message': "Error activating! %s" % e }
+ ooff = { 'active_state': True , 'setup_name': su.name }
+ self.channel.basic_publish(exchange=utils.EXCHANGE, routing_key=utils.QUEUE_ON_OFF, body=json.dumps(ooff))
+ retval = {'status': 'success', 'message': "Activated setup %s!" % su.name}
else:
- return {'status': 'success', 'message': "Activated setup %s!" % su.name}
- else:
- return {'status':'error', 'message': "Invalid ID!" }
-
- return {'status': 'error', 'message': 'No data recieved!'}
+ retval = {'status':'error', 'message': "Error activating %s! No connection to queue server!" % su.name }
+
+ except pika.exceptions.ConnectionClosed:
+ cherrypy.log("Reconnecting to RabbitMQ Server!")
+ reconnected = self.connect(5)
+ if reconnected:
+ cherrypy.log("Reconnect finished!")
+ su.active_state = True
+ self.db.commit()
+ ooff = { 'active_state': True, 'setup_name': su.name }
+ self.channel.basic_publish(exchange=utils.EXCHANGE, routing_key=utils.QUEUE_ON_OFF, body=json.dumps(ooff))
+ retval = {'status': 'success', 'message': "Activated setup %s!" % su.name}
+ else:
+ retval = {'status':'error', 'message': "Error activating %s! Wasn't able to reconnect!" % su.name }
+ except Exception as e:
+ su.active_state = False
+ self.db.commit()
+ cherrypy.log("Error activating! %s"%str(e), traceback=True)
+ retval = {'status':'error', 'message': "Error activating! %s" % e }
+
+ else:
+ retval = {'status':'error', 'message': "Invalid ID!" }
+
+ if(is_json):
+ cherrypy.response.headers['Content-Type'] = "application/json"
+ return json.dumps(retval)
+ else:
+ tmpl = self.lookup.get_template("activate.mako")
+ return tmpl.render(page_title="Activate", message = retval['message'], status=retval['status'])
+
@cherrypy.expose
@cherrypy.tools.json_in()
- @cherrypy.tools.json_out(handler=utils.json_handler)
- def deactivate(self):
- if(hasattr(cherrypy.request, 'json')):
+ #@cherrypy.tools.json_out(handler=utils.json_handler)
+ def deactivate(self, **kwargs):
+ retval = {}
+ is_json = False
+ id=0
+
+ if(hasattr(cherrypy.request, 'json')):
id = cherrypy.request.json['id']
+ is_json = True
+ elif('id' in kwargs):
+ id = kwargs['id']
+ else:
+ retval = {'status': 'error', 'message': 'No data recieved!'}
- if(id and id > 0):
- su = self.db.query(objects.Setup).get(int(id))
- try:
- if(hasattr(self, "channel")):
- su.active_state = False
- self.db.commit()
- ooff = { 'active_state': False, 'setup_name': su.name }
- self.channel.basic_publish(exchange=utils.EXCHANGE, routing_key=utils.QUEUE_ON_OFF, body=json.dumps(ooff))
- else:
- return {'status':'error', 'message': "Error deactivating %s! No connection to queue server!"%su.name }
-
- except pika.exceptions.ConnectionClosed:
- cherrypy.log("Reconnecting to RabbitMQ Server!")
- reconnected = self.connect(5)
- if reconnected:
- cherrypy.log("Reconnect finished!")
- su.active_state = False
- self.db.commit()
- ooff = { 'active_state': False, 'setup_name': su.name }
- self.channel.basic_publish(exchange=utils.EXCHANGE, routing_key=utils.QUEUE_ON_OFF, body=json.dumps(ooff))
- return {'status': 'success', 'message': "Deactivated setup %s!" % su.name}
- else:
- return {'status':'error', 'message': "Error deactivating %s! Wasn't able to reconnect!" % su.name }
-
- except Exception as e:
- su.active_state = True;
+ if(id and id > 0):
+ su = self.db.query(objects.Setup).get(int(id))
+ try:
+ if(hasattr(self, "channel")):
+ su.active_state = False
self.db.commit()
- cherrypy.log("Error deactivating! %s"%str(e), traceback=True)
- return {'status':'error', 'message': "Error deactivating! %s" % e }
+ ooff = { 'active_state': False , 'setup_name': su.name }
+ self.channel.basic_publish(exchange=utils.EXCHANGE, routing_key=utils.QUEUE_ON_OFF, body=json.dumps(ooff))
+ retval = {'status': 'success', 'message': "Deactivated setup %s!" % su.name}
else:
- return {'status': 'success', 'message': "Deactivated setup %s!" % su.name}
+ retval = {'status':'error', 'message': "Error deactivating %s! No connection to queue server!" % su.name }
- return {'status':'error', 'message': "Invalid ID!" }
+ except pika.exceptions.ConnectionClosed:
+ cherrypy.log("Reconnecting to RabbitMQ Server!")
+ reconnected = self.connect(5)
+ if reconnected:
+ cherrypy.log("Reconnect finished!")
+ su.active_state = False
+ self.db.commit()
+ ooff = { 'active_state': False, 'setup_name': su.name }
+ self.channel.basic_publish(exchange=utils.EXCHANGE, routing_key=utils.QUEUE_ON_OFF, body=json.dumps(ooff))
+ retval = {'status': 'success', 'message': "Deactivated setup %s!" % su.name}
+ else:
+ retval = {'status':'error', 'message': "Error deactivating %s! Wasn't able to reconnect!" % su.name }
+
+ except Exception as e:
+ su.active_state = True
+ self.db.commit()
+ cherrypy.log("Error deactivating! %s"%str(e), traceback=True)
+ retval = {'status':'error', 'message': "Error deactivating! %s" % e }
+
+ else:
+ retval = {'status':'error', 'message': "Invalid ID!" }
- return {'status': 'error', 'message': 'No data recieved!'}
+ if(is_json):
+ cherrypy.response.headers['Content-Type'] = "application/json"
+ return json.dumps(retval)
+ else:
+ tmpl = self.lookup.get_template("activate.mako")
+ return tmpl.render(page_title="Deactivate", message = retval['message'], status=retval['status'])
+
+
@cherrypy.expose
@cherrypy.tools.json_in()
diff --git a/webinterface/sites/actions.py b/webinterface/sites/actions.py
index fa30348..f828fc2 100644
--- a/webinterface/sites/actions.py
+++ b/webinterface/sites/actions.py
@@ -22,9 +22,9 @@ def __init__(self):
@cherrypy.expose
- def index(self, flash_message=None):
+ def index(self):
tmpl = self.lookup.get_template("actions.mako")
- return tmpl.render(page_title="Actions", flash_message=flash_message)
+ return tmpl.render(page_title="Actions")
diff --git a/webinterface/sites/alarms.py b/webinterface/sites/alarms.py
index 55b9106..6bfc0f4 100644
--- a/webinterface/sites/alarms.py
+++ b/webinterface/sites/alarms.py
@@ -22,9 +22,9 @@ def __init__(self):
@cherrypy.expose
- def index(self, flash_message=None):
+ def index(self):
tmpl = self.lookup.get_template("alarms.mako")
- return tmpl.render(page_title="Alarms", flash_message=flash_message)
+ return tmpl.render(page_title="Alarms")
@cherrypy.expose
@cherrypy.tools.json_in()
diff --git a/webinterface/sites/notifiers.py b/webinterface/sites/notifiers.py
index 5ff4b13..a325d50 100644
--- a/webinterface/sites/notifiers.py
+++ b/webinterface/sites/notifiers.py
@@ -22,9 +22,9 @@ def __init__(self):
@cherrypy.expose
- def index(self, flash_message=None):
+ def index(self):
tmpl = self.lookup.get_template("notifiers.mako")
- return tmpl.render(page_title="Notifiers", flash_message=flash_message)
+ return tmpl.render(page_title="Notifiers")
diff --git a/webinterface/sites/setups.py b/webinterface/sites/setups.py
index 811864a..a23d934 100644
--- a/webinterface/sites/setups.py
+++ b/webinterface/sites/setups.py
@@ -20,9 +20,9 @@ def __init__(self):
@cherrypy.expose
- def index(self, flash_message=None):
+ def index(self):
tmpl = self.lookup.get_template("setups.mako")
- return tmpl.render(page_title="Setups", flash_message=flash_message)
+ return tmpl.render(page_title="Setups")
diff --git a/webinterface/sites/workers.py b/webinterface/sites/workers.py
index 83830fc..414f649 100644
--- a/webinterface/sites/workers.py
+++ b/webinterface/sites/workers.py
@@ -21,9 +21,9 @@ def __init__(self):
@cherrypy.expose
- def index(self, flash_message=None):
+ def index(self):
tmpl = self.lookup.get_template("workers.mako")
- return tmpl.render(page_title="Workers", flash_message=flash_message)
+ return tmpl.render(page_title="Workers")
diff --git a/webinterface/sites/zones.py b/webinterface/sites/zones.py
index 92e1728..e284feb 100644
--- a/webinterface/sites/zones.py
+++ b/webinterface/sites/zones.py
@@ -19,9 +19,9 @@ def __init__(self):
@cherrypy.expose
- def index(self, flash_message=None):
+ def index(self):
tmpl = self.lookup.get_template("zones.mako")
- return tmpl.render(page_title="Zones", flash_message=flash_message)
+ return tmpl.render(page_title="Zones")
diff --git a/webinterface/static/js/app.js b/webinterface/static/js/app.js
index 3d86f66..e379e3e 100644
--- a/webinterface/static/js/app.js
+++ b/webinterface/static/js/app.js
@@ -161,7 +161,7 @@ app.controller('DataController', ['$uibModal', '$http', '$log', '$scope', '$time
for (var key in self.fields) {
if (self.fields.hasOwnProperty(key)) {
- if($.inArray(filter, self.fields[key]['visible']) >= 0){
+ if(self.fields[key]['visible'].indexOf(filter) >= 0){
filtered_fields[key] = self.fields[key];
}
}
@@ -196,7 +196,7 @@ app.controller('DataController', ['$uibModal', '$http', '$log', '$scope', '$time
self.showEdit = function(id){
self.dialogTitle = "Edit";
self.form_fields = self.getFields('update')
- self.edit_data = jQuery.extend(true, {}, self.data[id])
+ self.edit_data = angular.copy(self.data[id])
self.edit_id = id;
self.orig_data = self.data[id];
self.dialog = $uibModal.open({
@@ -316,7 +316,7 @@ app.controller('DataController', ['$uibModal', '$http', '$log', '$scope', '$time
self.loading = true;
self.dialogTitle = "Copy";
self.form_fields = self.getFields('add')
- self.edit_data = jQuery.extend(true, {}, self.data[copyId])
+ self.edit_data = angular.copy(self.data[copyId])
self.edit_id = -1;
self.orig_data = self.data[copyId];
self.dialog = $uibModal.open({
@@ -451,6 +451,8 @@ app.controller('AckController', ['$http', '$log', '$interval', '$attrs', 'FlashS
self.ackclass = $attrs.ackclass;
+ self.btnText = "stop refresh"
+
self.entries = [];
@@ -500,7 +502,8 @@ app.controller('AckController', ['$http', '$log', '$interval', '$attrs', 'FlashS
if(!self.refresh_inter){
self.refresh_inter = $interval(self.refresh, 5000);
FlashService.flash('Started refresh of messages!', FlashService.TYPE_INFO, 2000);
- $('#refresh_toggle_'+self.ackclass).prop('value', "stop refresh");
+ //$('#refresh_toggle_'+self.ackclass).prop('value', "stop refresh");
+ self.btnText = "stop refresh";
}
}
@@ -509,7 +512,8 @@ app.controller('AckController', ['$http', '$log', '$interval', '$attrs', 'FlashS
$interval.cancel(self.refresh_inter);
self.refresh_inter = null;
FlashService.flash('Stopped refresh of messages!', FlashService.TYPE_INFO, 2000);
- $('#refresh_toggle_'+self.ackclass).prop('value', "start refresh");
+ //$('#refresh_toggle_'+self.ackclass).prop('value', "start refresh");
+ self.btnText = "start refresh";
}
}
diff --git a/webinterface/templates/activate.mako b/webinterface/templates/activate.mako
new file mode 100644
index 0000000..19d0136
--- /dev/null
+++ b/webinterface/templates/activate.mako
@@ -0,0 +1,5 @@
+<%inherit file="main.mako"/>
+
+<%def name="active_tab()"><% return "activate" %>
+Status: ${status}Sensors
-
-
-
-
- ID
- Description
- GPIO PIN
-
-
-
- 1
- PIR kitchen
- 12
-
-
-
-
- 2
- PIR entrance
- 17
-
-
+${message}
\ No newline at end of file
diff --git a/webinterface/templates/index.mako b/webinterface/templates/index.mako
index 352e242..d75bb8a 100644
--- a/webinterface/templates/index.mako
+++ b/webinterface/templates/index.mako
@@ -23,7 +23,7 @@
Alarms
-
+
{{alarm.alarmtime | date:'dd. MMM. yyyy, HH:mm:ss'}} {{alarm.sensor_id}}: {{alarm.message}}
@@ -35,7 +35,7 @@
Log Messages
-
+
{{log.logtime | date:'dd. MMM. yyyy, HH:mm:ss'}} {{log.sender}}: {{log.message}}
diff --git a/webinterface/templates/main.mako b/webinterface/templates/main.mako
index 4632291..8e11fab 100644
--- a/webinterface/templates/main.mako
+++ b/webinterface/templates/main.mako
@@ -1,4 +1,4 @@
-<%page args="flash_message='',flash_type='info'"/>
+
<%
active_tab = self.active_tab()
%>
diff --git a/worker/buzzer.py b/worker/buzzer.py
index 5cbb48c..9581d48 100644
--- a/worker/buzzer.py
+++ b/worker/buzzer.py
@@ -6,8 +6,8 @@
class Buzzer(Action):
- def __init__(self, id, params):
- super(Buzzer, self).__init__(id, params)
+ def __init__(self, id, params, worker):
+ super(Buzzer, self).__init__(id, params, worker)
try:
self.duration = int(params["duration"])
self.gpio_pin = int(params["gpio_pin"])
diff --git a/worker/ffmpegvideo.py b/worker/ffmpegvideo.py
new file mode 100644
index 0000000..2f21e5c
--- /dev/null
+++ b/worker/ffmpegvideo.py
@@ -0,0 +1,90 @@
+import os
+import time
+import ffmpy
+import logging
+
+from tools.action import Action
+
+class FFMPEGVideo(Action):
+ """
+ This module is like the "webcam" module but uses the fine "ffmpeg" for capturing picture snapshots.
+ For interacting with ffmpeg, the ffmpy command line wrapper is used.
+
+ Setup:
+ - apt install ffmpeg
+ - pip install ffmpy
+ """
+
+ def __init__(self, id, params):
+ super(FFMPEGVideo, self).__init__(id, params)
+
+ logging.info('FFMPEGVideo: Starting')
+
+ # Set parameter defaults
+ self.params.setdefault('name', 'default')
+ self.params.setdefault('count', 3)
+ self.params.setdefault('interval', 5)
+ self.params.setdefault('data_path', '/var/tmp/secpi/worker_data')
+ self.params.setdefault('ffmpeg_global_options', '-v quiet -stats')
+ self.params.setdefault('ffmpeg_input_options', None)
+ self.params.setdefault('ffmpeg_output_options', '-pix_fmt yuvj420p -vsync 2 -vframes 1')
+
+ # Define required params
+ required_params = ['url']
+
+ # Configuration parameter checks
+ for required_param in required_params:
+ if required_param not in self.params:
+ self.post_err("FFMPEGVideo: Configuration parameter '{}' is missing".format(required_param))
+ self.corrupted = True
+ return
+
+ # Sanity checks
+ if not os.path.exists(self.params['data_path']):
+ self.post_err("FFMPEGVideo: Path does not exist. data_path={}".format(self.params['data_path']))
+ self.corrupted = True
+ return
+
+ def exffmpeg(self, url, filename, global_options=None, input_options=None, output_options=None):
+ ff = ffmpy.FFmpeg(
+ global_options = global_options,
+ inputs = {url: input_options},
+ outputs = {filename: output_options}
+ )
+ ff.run()
+
+ # Take a series of pictures within a given interval
+ def take_adv_picture(self, num_of_pic, seconds_between):
+ logging.debug("FFMPEGVideo: Trying to take pictures")
+
+ name = self.params['name']
+ url = self.params['url']
+ timestamp = time.strftime("%Y%m%d%H%M%S")
+
+ for index in range(0, num_of_pic):
+ filename = '{name}-{timestamp}-{index}.jpg'.format(**locals())
+ filepath = os.path.join(self.params['data_path'], filename)
+ logging.info("FFMPEGVideo: Trying to take a picture from {url} to {filepath}".format(**locals()))
+ try:
+ result = self.exffmpeg(url, filepath,
+ global_options=self.params['ffmpeg_global_options'],
+ input_options=self.params['ffmpeg_input_options'],
+ output_options=self.params['ffmpeg_output_options'],
+ )
+ except Exception as ex:
+ self.post_err("FFMPEGVideo: Wasn't able to take picture from {url} to {filepath}: %s".format(**locals()) % ex)
+
+ # Wait until next interval
+ time.sleep(seconds_between)
+
+ logging.debug("FFMPEGVideo: Finished taking pictures")
+
+
+ def execute(self):
+ if not self.corrupted:
+ self.take_adv_picture(int(self.params["count"]), int(self.params["interval"]))
+ else:
+ self.post_err("FFMPEGVideo: Wasn't able to take pictures because of an initialization error")
+
+ def cleanup(self):
+ logging.debug("FFMPEGVideo: No cleanup necessary at the moment")
diff --git a/worker/gpio_sensor.py b/worker/gpio_sensor.py
index b54eea3..00a115e 100644
--- a/worker/gpio_sensor.py
+++ b/worker/gpio_sensor.py
@@ -11,12 +11,15 @@ def __init__(self, id, params, worker):
try:
self.gpio = int(params["gpio"])
self.bouncetime = int(self.params['bouncetime'])
+ self.edge = self.params.get('edge', 'rising').lower()
+ if self.edge not in ['rising', 'falling', 'both']:
+ raise ValueError("GPIOSensor: Parameter 'edge' must be one of ['rising', 'falling', 'both']")
except ValueError as ve: # if one configuration parameter can't be parsed as int
- logging.error("GPIOSensor: Wasn't able to initialize the sensor, please check your configuration: %s" % ve)
+ self.post_err("GPIOSensor: Wasn't able to initialize the sensor, please check your configuration: %s" % ve)
self.corrupted = True
return
except KeyError as ke: # if config parameters are missing in the file
- logging.error("GPIOSensor: Wasn't able to initialize the sensor, it seems there is a config parameter missing: %s" % ke)
+ self.post_err("GPIOSensor: Wasn't able to initialize the sensor, it seems there is a config parameter missing: %s" % ke)
self.corrupted = True
return
@@ -26,9 +29,17 @@ def __init__(self, id, params, worker):
def setup_sensor(self):
try:
GPIO.setup(self.gpio, GPIO.IN)
- GPIO.add_event_detect(self.gpio, GPIO.RISING, callback=self.cb_alarm, bouncetime=self.bouncetime)
+ if self.edge == 'rising':
+ edge_type = GPIO.RISING
+ elif self.edge == 'falling':
+ edge_type = GPIO.FALLING
+ elif self.edge == 'both':
+ edge_type = GPIO.BOTH
+ else:
+ raise ValueError("GPIOSensor: Unknown edge type: %s" % self.edge)
+ GPIO.add_event_detect(self.gpio, edge_type, callback=self.cb_alarm, bouncetime=self.bouncetime)
except ValueError as ve: # GPIO pin number or bouncetime is not in valid range
- logging.error("GPIOSensor: The given pin number or bouncetime is not in a valid range: %s" % ve)
+ self.post_err("GPIOSensor: The given pin number or bouncetime is not in a valid range: %s" % ve)
return
logging.debug("GPIOSensor: Registered sensor at pin %s!" % self.gpio)
@@ -37,24 +48,31 @@ def cleanup_sensor(self):
GPIO.remove_event_detect(self.gpio)
GPIO.cleanup(self.gpio)
except ValueError as ve: # GPIO pin number is not in valid range
- logging.error("GPIOSensor: The given pin number is not in a valid range: %s" % ve)
+ self.post_err("GPIOSensor: The given pin number is not in a valid range: %s" % ve)
logging.debug("GPIOSensor: Removed sensor at pin %s!" % self.gpio)
# callback for alarm
def cb_alarm(self, channel):
- if(self.active):
- self.alarm("GPIO sensor at pin %s activated!" % channel)
-
+ if self.active:
+ if self.edge in ['rising', 'falling']:
+ self.alarm("GPIO sensor at pin %s detected something!" % channel)
+ else:
+ if GPIO.input(channel):
+ state = 'activated'
+ else:
+ state = 'deactivated'
+ self.alarm("GPIO sensor at pin %s %s" % (channel, state))
+
def activate(self):
if not self.corrupted:
self.active = True
self.setup_sensor()
else:
- logging.error("GPIOSensor: Sensor couldn't be activated")
+ self.post_err("GPIOSensor: Sensor couldn't be activated")
def deactivate(self):
if not self.corrupted:
self.active = False
self.cleanup_sensor()
else:
- logging.error("GPIOSensor: Sensor couldn't be deactivated") # maybe make this more clear
\ No newline at end of file
+ self.post_err("GPIOSensor: Sensor couldn't be deactivated") # maybe make this more clear
\ No newline at end of file
diff --git a/worker/pinger.py b/worker/pinger.py
new file mode 100644
index 0000000..b233ccb
--- /dev/null
+++ b/worker/pinger.py
@@ -0,0 +1,61 @@
+from tools.sensor import Sensor
+import logging
+import pyping
+import threading
+import time
+
+class Pinger(Sensor):
+
+ def __init__(self, id, params, worker):
+ super(Pinger, self).__init__(id, params, worker)
+
+ try:
+ self.interval = int(params["interval"])
+ self.max_losses = int(params["max_losses"])
+ self.destination_ip = params["destination_ip"]
+ self.bouncetime = int(params["bounce_time"])
+ except KeyError as ke: # if config parameters are missing in file
+ self.post_err("Pinger: Wasn't able to initialize, it seems there is a config parameter missing: %s" % ke)
+ self.corrupted = True
+ return
+ except ValueError as ve: # if a parameter can't be parsed as int
+ self.post_err("Pinger: Wasn't able to initialize, please check your configuration: %s" % ve)
+ self.corrupted = True
+ return
+
+ logging.debug("Pinger: Sensor initialized")
+
+ def activate(self):
+ if not self.corrupted:
+ self.stop_thread = False
+ self.pinger_thread = threading.Thread(name="thread-pinger-%s" % self.destination_ip, target=self.check_up)
+ self.pinger_thread.start()
+ else:
+ self.post_err("Pinger: Sensor couldn't be activated")
+
+ def deactivate(self):
+ if not self.corrupted:
+ self.stop_thread = True
+ else:
+ self.post_err("Pinger: Sensor couldn't be deactivated")
+
+
+ def check_up(self):
+ losses = 0
+ while True:
+ if self.stop_thread:
+ return
+
+ reply = pyping.ping(self.destination_ip) # ret value is 0 when reachable
+ if reply.ret_code:
+ losses += 1
+ logging.info("Pinger: Loss happened, %d/%d" % (losses, self.max_losses))
+ else:
+ losses = 0
+
+ if losses >= self.max_losses:
+ self.alarm("%d consecutive pings were lost" % losses)
+ losses = 0
+ time.sleep(self.bouncetime)
+ continue
+ time.sleep(self.interval)
\ No newline at end of file
diff --git a/worker/speaker.py b/worker/speaker.py
index 1231139..5d6b91f 100644
--- a/worker/speaker.py
+++ b/worker/speaker.py
@@ -5,8 +5,8 @@
class Speaker(Action):
- def __init__(self, id, params):
- super(Speaker, self).__init__(id, params)
+ def __init__(self, id, params, worker):
+ super(Speaker, self).__init__(id, params, worker)
try:
self.path_to_audio = params["path_to_audio"]
self.repetitions = int(params["repetitions"])
@@ -32,7 +32,7 @@ def play_audio(self):
return
pygame.mixer.music.set_volume(1)
- for i in range(0, self.repetitions):
+ for i in xrange(0, self.repetitions):
pygame.mixer.music.rewind()
pygame.mixer.music.play()
while pygame.mixer.music.get_busy():
diff --git a/worker/temperature_sensor.py b/worker/temperature_sensor.py
index d35a2d7..8562fae 100644
--- a/worker/temperature_sensor.py
+++ b/worker/temperature_sensor.py
@@ -17,11 +17,11 @@ def __init__(self, id, params, worker):
self.bouncetime = int(params["bouncetime"])
self.device_id = params["device_id"]
except ValueError as ve: # if one configuration parameter can't be parsed as int
- logging.error("TemperatureSensor: Wasn't able to initialize the sensor, please check your configuration: %s" % ve)
+ self.post_err("TemperatureSensor: Wasn't able to initialize the sensor, please check your configuration: %s" % ve)
self.corrupted = True
return
except KeyError as ke: # if config parameters are missing
- logging.error("TemperatureSensor: Wasn't able to initialize the sensor, it seems there is a config parameter missing: %s" % ke)
+ self.post_err("TemperatureSensor: Wasn't able to initialize the sensor, it seems there is a config parameter missing: %s" % ke)
self.corrupted = True
return
@@ -34,7 +34,7 @@ def __init__(self, id, params, worker):
if not os.path.isfile(self.device_file): # if there is no slave file which contains the temperature
self.corrupted = True
- logging.error("TemperatureSensor: Wasn't able to find temperature file at %s" % self.device_file)
+ self.post_err("TemperatureSensor: Wasn't able to find temperature file at %s" % self.device_file)
return
logging.debug("TemperatureSensor: Sensor initialized")
@@ -46,13 +46,13 @@ def activate(self):
target=self.check_temperature)
self.checker_thread.start()
else:
- logging.error("TemperatureSensor: Sensor couldn't be activated")
+ self.post_err("TemperatureSensor: Sensor couldn't be activated")
def deactivate(self):
if not self.corrupted:
self.stop_thread = True
else:
- logging.error("TemperatureSensor: Sensor couldn't be deactivated")
+ self.post_err("TemperatureSensor: Sensor couldn't be deactivated")
def check_temperature(self):
while True:
@@ -67,9 +67,9 @@ def check_temperature(self):
time.sleep(3)
def read_temp_raw(self):
- f = open(self.device_file, 'r')
- lines = f.readlines()
- f.close()
+ with open(self.device_file, 'r') as f:
+ lines = f.readlines()
+
return lines
def read_temp(self):
diff --git a/worker/testaction.py b/worker/testaction.py
index 87b11a4..608ce3d 100644
--- a/worker/testaction.py
+++ b/worker/testaction.py
@@ -1,18 +1,21 @@
import logging
from tools.action import Action
+from tools import utils
class TestAction(Action):
- def __init__(self, id, params):
- super(TestAction, self).__init__(id, params)
+ def __init__(self, id, params, worker):
+ super(TestAction, self).__init__(id, params, worker)
logging.debug("Test Action initialized!")
def execute(self):
- logging.log("Executing Test Action!")
+ logging.info("Executing Test Action!")
+ self.post_log("Executing Test Action!", utils.LEVEL_INFO)
if 'msg' in self.params:
- logging.log("Test Action Message: %s"%self.params['msg'])
+ logging.info("Test Action Message: %s"%self.params['msg'])
+ self.post_log("Test Action Message: %s"%self.params['msg'], utils.LEVEL_INFO)
def cleanup(self):
logging.debug("Test Action Cleanup")
diff --git a/worker/webcam.py b/worker/webcam.py
index 9e8067c..b5fc9d5 100644
--- a/worker/webcam.py
+++ b/worker/webcam.py
@@ -7,19 +7,19 @@
class Webcam(Action):
- def __init__(self, id, params):
- super(Webcam, self).__init__(id, params)
+ def __init__(self, id, params, worker):
+ super(Webcam, self).__init__(id, params, worker)
try:
self.path = params["path"]
self.resolution = (int(params["resolution_x"]), int(params["resolution_y"]))
self.data_path = params.get("data_path", "/var/tmp/secpi/worker_data")
except ValueError as ve: # if resolution can't be parsed as int
- logging.error("Webcam: Wasn't able to initialize the device, please check your configuration: %s" % ve)
+ self.post_err("Webcam: Wasn't able to initialize the device, please check your configuration: %s" % ve)
self.corrupted = True
return
except KeyError as ke: # if config parameters are missing in file
- logging.error("Webcam: Wasn't able to initialize the device, it seems there is a config parameter missing: %s" % ke)
+ self.post_err("Webcam: Wasn't able to initialize the device, it seems there is a config parameter missing: %s" % ke)
self.corrupted = True
return
@@ -33,19 +33,19 @@ def take_adv_picture(self, num_of_pic, seconds_between):
try:
self.cam.start()
except SystemError as se: # device path wrong
- logging.error("Webcam: Wasn't able to find video device at device path: %s" % self.path)
+ self.post_err("Webcam: Wasn't able to find video device at device path: %s" % self.path)
return
except AttributeError as ae: # init failed, taking pictures won't work -> shouldn't happen but anyway
- logging.error("Webcam: Couldn't take pictures because video device wasn't initialized properly")
+ self.post_err("Webcam: Couldn't take pictures because video device wasn't initialized properly")
return
try:
- for i in range(0,num_of_pic):
+ for i in xrange(0,num_of_pic):
img = self.cam.get_image()
pygame.image.save(img, "%s/%s_%d.jpg" % (self.data_path, time.strftime("%Y%m%d_%H%M%S"), i))
time.sleep(seconds_between)
except Exception as e:
- logging.error("Webcam: Wasn't able to take pictures: %s" % e)
+ self.post_err("Webcam: Wasn't able to take pictures: %s" % e)
self.cam.stop()
logging.debug("Webcam: Finished taking pictures")
@@ -55,7 +55,7 @@ def execute(self):
if not self.corrupted:
self.take_adv_picture(int(self.params["count"]), int(self.params["interval"]))
else:
- logging.error("Webcam: Wasn't able to take pictures because of an initialization error")
+ self.post_err("Webcam: Wasn't able to take pictures because of an initialization error")
def cleanup(self):
logging.debug("Webcam: No cleanup necessary at the moment")
\ No newline at end of file
diff --git a/worker/worker.py b/worker/worker.py
index 4a69fc9..4e32956 100644
--- a/worker/worker.py
+++ b/worker/worker.py
@@ -50,15 +50,14 @@ def __init__(self):
logging.error("Wasn't able to load config file, exiting...")
quit()
- time.sleep(60) # TEMPORARY FIX for #83
-
self.prepare_data_directory(self.data_directory)
self.connect()
# if we don't have a pi id we need to request the initial config, afterwards we have to reconnect
# to the queues which are specific to the pi id -> hence, call connect again
if not config.get('pi_id'):
- logging.debug("No Pi ID found, will request initial configuration...")
+ logging.info("No Pi ID found, will request initial configuration...")
+ time.sleep(60)
self.fetch_init_config()
else:
logging.info("Setting up sensors and actions")
@@ -91,7 +90,10 @@ def connect(self):
connected = True
logging.info("Connection to manager established")
except pika.exceptions.AMQPConnectionError as pe: # if connection can't be established
- logging.error("Wasn't able to open a connection to the manager: %s" % pe)
+ if "The AMQP connection was closed" in repr(pe):
+ logging.error("Wasn't able to connect to the rabbitmq service, please check if the rabbitmq service is reachable and running")
+ else:
+ logging.error("Wasn't able to open a connection to the manager: %s" % repr(pe))
time.sleep(30)
self.channel.exchange_declare(exchange=utils.EXCHANGE, exchange_type='direct')
@@ -207,7 +209,7 @@ def clear_message_queue(self):
def post_err(self, msg):
- logging.exception(msg)
+ logging.error(msg)
err = { "msg": msg,
"level": utils.LEVEL_ERR,
"sender": "Worker %s"%config.get('pi_id'),
@@ -216,7 +218,7 @@ def post_err(self, msg):
self.send_json_msg(utils.QUEUE_LOG, err)
def post_log(self, msg, lvl):
- logging.exception(msg)
+ logging.info(msg)
lg = { "msg": msg,
"level": lvl,
"sender": "Worker %s"%config.get('pi_id'),
@@ -342,8 +344,8 @@ def got_action(self, ch, method, properties, body):
t.join()
if self.prepare_data(): #check if there is any data to send
- zip_file = open("%s/%s.zip" % (self.zip_directory, config.get('pi_id')), "rb")
- byte_stream = zip_file.read()
+ with open("%s/%s.zip" % (self.zip_directory, config.get('pi_id')), "rb") as zip_file:
+ byte_stream = zip_file.read()
self.send_msg(utils.QUEUE_DATA, byte_stream)
logging.info("Sent data to manager")
self.cleanup_data()
@@ -368,9 +370,9 @@ def apply_config(self, new_config):
# TODO: check valid config file?!
# write config to file
try:
- f = open('%s/worker/config.json'%(PROJECT_PATH),'w')
- f.write(json.dumps(new_config))
- f.close()
+ with open('%s/worker/config.json'%(PROJECT_PATH),'w') as f:
+ f.write(json.dumps(new_config))
+
except Exception as e:
logging.exception("Wasn't able to write config file:\n%s" % e)
@@ -437,7 +439,7 @@ def setup_actions(self):
try:
logging.info("Trying to register action: %s" % action["id"])
a = self.class_for_name(action["module"], action["class"])
- act = a(action["id"], action["params"])
+ act = a(action["id"], action["params"], self)
except Exception as e: #AttributeError, KeyError
self.post_err("Pi with id '%s' wasn't able to register action '%s':\n%s" % (config.get('pi_id'), action["class"],e))
else: