From 21555736f6c35828e069b25260aaa73f9bb17fac Mon Sep 17 00:00:00 2001
From: Wolfgang Hottgenroth <wolfgang.hottgenroth@icloud.com>
Date: Mon, 15 Jul 2019 15:57:39 +0100
Subject: [PATCH] fixes related to not set subscribeTopic and logger in objects

---
 src/MqttProcessor.py      |   4 ++--
 src/registers.pkl         | Bin 2260 -> 1823 bytes
 src/updateRegisterFile.py |   3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/MqttProcessor.py b/src/MqttProcessor.py
index 2b27bd2..7e9bbaf 100644
--- a/src/MqttProcessor.py
+++ b/src/MqttProcessor.py
@@ -34,7 +34,7 @@ class MqttProcessor(threading.Thread, AbstractNotificationReceiver):
     def __processUpdatedRegisters(self, force=False):
         self.logger.debug("MqttProcessor.__updateSubscriptions")
 
-        subscribeTopics = [ r.subscribeTopic for r in self.registers if r.subscribeTopic]
+        subscribeTopics = [ r.subscribeTopic for r in self.registers if hasattr(r,'subscribeTopic') and r.subscribeTopic]
         self.logger.debug("Topics: {0!s}".format(subscribeTopics))
 
         for subscribeTopic in subscribeTopics:
@@ -49,7 +49,7 @@ class MqttProcessor(threading.Thread, AbstractNotificationReceiver):
                 self.client.unsubscribe(subscription)
                 self.subscriptions.remove(subscription)
 
-        self.topicRegisterMap = { r.subscribeTopic: r for r in self.registers if r.subscribeTopic }
+        self.topicRegisterMap = { r.subscribeTopic: r for r in self.registers if hasattr(r,'subscribeTopic') and r.subscribeTopic }
 
     def receiveNotification(self, arg):
         self.logger.info("MqttProcessor:registersChanged")
diff --git a/src/registers.pkl b/src/registers.pkl
index af220a53b08ddb4128673749f2c53165207dd2a3..4e159cb8896577ce5aa18b5ade71ef027a027308 100644
GIT binary patch
literal 1823
zcmai!%XSo16o#vlbh=Xwbb=8Lhz1pHynrOp2*e9?#6Xb-Phu!95$bZtDXCP|Uzdd$
z)ItZfT>TD=oH_9sd<tidoH@fMVAnP2BrQGYUUmBHeZK$Sf1RI4Hz9Ql#<#2><o>c2
zYMyI3p?t&fqVV7{YUh5zNQ}{r+LR<IFf@m0A;*|u(obk@b2<GoxgBaU>WZW+DblYP
zXJ}*v+(E=6Zlc*&Wop2E-}Sq0<b;?|M${H9*;){GT_@Cx5b|!@sy|v?x$#e<-Cmq(
zJ`Qjs!BK`|YJ*BO)AV@|psm!@F?x<1E5xKySC7zx=eq{|nIASqi|P51m-fBw*gH7h
z&j>x=a(ye@!3)$RtBZ8o3dFkWSq7%nHdWn;^b6~J+vC0#Mn1=jYMoY%OvVW+o1mvu
z#)f7`94~F+W#y@s5rsP*$BcT6Hdv{{vwq<`PG&u9P3JaFWk&2h;gv`isr9F0yxI|C
zJ<;ro2}KgJ$lYkQ7Hh5le!^=BW*N?iwlX3}xR|0n$NPe`i0MpCioOzUTV^WpbwRX(
z_}*CkyQYa5aZ;ShOsICe8R>_FW7!G}pNBjP$!=zFmI&X9@iq~PYW5w5bNg{=c<tu+
zZ+IucyA1CUu0*(Fggbf=ckPiC8iEISzr;P?=@%a^ax=|>Xf|^d7YZF!=?91ESaEIB
za<&eM`9)GP7h`@v$pXWNg%b5BP4EHdrmh(e^Jsk3tENHnCdcnT#bSbw87_(T>dhym
zK6Q#JA5p?M<Mb|+A-UY!H>515+`ot`q<Vy8PEwu7fp=50ltn3sbQ*}I^PJ?9ULn8g
z@hQb8mGoJR&j%!3Ww=%jXHY<UJUWYRf@Ov;NWiU1fEb24hwC}2SQ7gY=I~{KuoC0O
z0K!cMWe7s^uL!pitTOZnq4#`*dE6d~Fb~Rp=E7Go*Z{&B!}<_}M)zNQonV9EE+O1`
zKEeXjp$H53ra<^M#&;z`ExjSXXV}aUYGQB@Gxa}r@I!)o4EG7)YKgGCJBak!OkeB`
z?gy6ZKqG?Mu*m57aMJs-+;0?AW(;0Z$tl$XhONVmIZ^-p4~PU7!;gEZt_-Jo_<vOP
zL8|S7%8B8YR8mUiF`%N#uJP;FD($|I)38)FNjZ=trhEDMf{x1W*R?&41@y+Gw|3#k
Ly}Jk_ou7XO;AIxx

literal 2260
zcma)-%X1V}6vihZ&z^*bF%VH98iBz_0!aWxz(*nmCTU_5lLj5}cK1zgo1X6e`jHT|
z1=JD7_gfeK2mUW^+_<sIDy?$i&ZP^>)3;|PQ(>@}&CJ}s=iJ}-opVoL-&R7dU}}8D
z4kI2+vxxbg?MBKu*N>yym(h0k2HF#BE9iZ>T+WXT#}37U=i4Sa^c}P`9~)x}yzKLU
zMRCB<sdv*Vv#fxJA-alfx<dbX5O~3q7rPO<i#ffQmK+vFi_D2RdP?Xm{>$_ZT8&*h
zf>P|vjte}KvSe|2itC{reqein9c`eGa_4J_raU)dW`uszViAw*GFKWuuzgDD{=K_@
zpg*sy{e&GA?9{MJ@1#&u65T_Iy3$16$_fuKV5UE8cSV_%3kvQf69yCPE=X`c@O-vH
z$6(JbDYnd9mIe+r0_U<71@}?p-URm-<VMR5nc;9eKvGh%f#*eduo0!v-};gJC~$v*
z;ewz;QrUvJmcxS(50&t+jCNU>V`MYYBXVEu3=0RUQli7xxPybmeNv*&0!}qJq)MJ;
z+o2{1Q7GYXY-DCi$x~FE5Ra<*9y*zq?I_}w>dj;bODu579XwXmcV@0>-1GwLEET{D
zHt@JAOP;woZBtdANHAK^chlz9ZH6&1sPCf3rr_pky$fflMR7!=<{wQko;o3h#9l!L
zOo$P2L>#D!gT<UUB=!qZFi8s1Bc|=p40y!lQH=)2F`4Lif)mY&o}@&_wj_Fr63J%Y
zD0`L>hoim~<D?9KI>D*t@Y582ax*+dJ(J*><}J@Q%B#kXQ?pRPbF}sO1XBfBq${$P
z)2b|{<C&{?L6zD_*IC(g%U)1sRE7XAs<FYuNOl)$h?v=gkY=2VjntF#^fe>S=tJbo
zjOSQXwz|8U&J?Az*#vXV+$u>cZpnHfHe$+11(>I&V_TlSM82h+8k)@2((9pZUdHrB
zTHJ}4f{Vpm@l-K)6AKz%mI2&F%wuk0u_`+!_S3t2!F4vURF#%Q8$O4wZ>Q{bI;e(&
z+5p3)tjU={O@3K+aPu&Fg=o_W_G*GsL3GHnrUPpxF56Z*LtYbI#dbj>N%WL(W$xED
zCTREwnl*yPi|7~G?8xU&wB`T4iq|V(8Vo@bLkx&Pp{ZiADwe837nj6kDW;LyjExp^
zwsm(Zu!xc;SZ=1gxNb*uBSNeYWv)&s3f0<&6Klt9tTgBPdPe?)UBMd~R%@)sg(e!#
zI~vM$aA_(H4S8pVrMqxzS{eXeOD%WmC<Q*LL4u%Jjhx~<IEqm3r#dckZW+v6&E6%E
zD!S&*|Bz~wKw)eUk!|qoajeSmuugNIYn-~J{_0p$@8m(g=Z{~oUcprj8{|Pd)oZrd
zgEuw2m3pAdAttiRvDsH|*DPpIC)7%*talPzYaweK*M$@@D@BM{75~GQKm8AGRPe5b
z_gb;Nuc0E@#1@Qkd{D!<nc!9nj0sdT4E1g>dVl;4A6D>@hL2lee4^pgmKYQGtcLM<
pf-hQNOybK7WBx8M`g;EQ8DCZKwT5q6VSKCMyOtP}_&zrH=zk5_!|wn9

diff --git a/src/updateRegisterFile.py b/src/updateRegisterFile.py
index 8ad9eef..2c4b7e8 100644
--- a/src/updateRegisterFile.py
+++ b/src/updateRegisterFile.py
@@ -13,7 +13,8 @@ newDatapoints = []
 for dp in datapoints:
     ndp = type(dp)()
     for k,v in dp.__dict__.items():
-        ndp.__dict__[k] = v
+        if k != 'logger':
+            ndp.__dict__[k] = v
     newDatapoints.append(ndp)
 
 RegisterDatapoint.checkRegisterList(newDatapoints, reset=True)