From 9ab3a1823a011c4ad0a94c6f58d84a86b97f6a84 Mon Sep 17 00:00:00 2001
From: Frank Brehm <frank@brehm-online.com>
Date: Sun, 21 Nov 2010 18:25:12 +0000
Subject: [PATCH] Bugfixing, Debug-Ausgabe mit pprint

git-svn-id: http://svn.brehm-online.com/svn/my-stuff/nagios/trunk@128 ec8d2aa5-1599-4edb-8739-2b3a1bc399aa
---
 bin/check_nagios_config.py |   3 ++-
 bin/nagios/config.py       |  11 +++++++----
 bin/nagios/config.pyc      | Bin 11525 -> 0 bytes
 bin/nagios/object/host.py  |  16 ++++++++--------
 4 files changed, 17 insertions(+), 13 deletions(-)
 delete mode 100644 bin/nagios/config.pyc

diff --git a/bin/check_nagios_config.py b/bin/check_nagios_config.py
index dc73f39..070da81 100755
--- a/bin/check_nagios_config.py
+++ b/bin/check_nagios_config.py
@@ -2,6 +2,7 @@
 # -*- coding: utf-8 -*-
 
 import sys
+import pprint
 from nagios.config import NagiosConfig, NagiosConfigError
 
 #print "Modul-Suchpfade:"
@@ -23,7 +24,7 @@ except NagiosConfigError as e:
 
 #print "Nagios-Objekt: " + repr( nagios_conf )
 
-print nagios_conf.dump_config()
+#print nagios_conf.dump_config()
 nagios_conf.read_objects()
 
 # vim: fileencoding=utf-8 filetype=python ts=4 expandtab
diff --git a/bin/nagios/config.py b/bin/nagios/config.py
index 0583a48..4130d12 100644
--- a/bin/nagios/config.py
+++ b/bin/nagios/config.py
@@ -9,6 +9,7 @@ import re
 import sys
 import warnings
 import logging
+import pprint
 import nagios.object.host
 
 class NagiosConfigError(Exception):
@@ -247,7 +248,9 @@ class NagiosConfig(object):
         for file_name in files:
             self.read_objectfile(file_name)
 
-        self.logger.debug( "Gelesene Objekte: {0!r}".format( self.objects ) )
+        #self.logger.debug( "Gelesene Objekte: {0!r}".format( self.objects ) )
+        pp = pprint.PrettyPrinter( indent = 4, depth = 6, width = 120 )
+        self.logger.debug( "Gelesene Objekte: {0}".format( pp.pformat( self.objects ) ) )
 
         return
 
@@ -298,9 +301,9 @@ class NagiosConfig(object):
                             self.logger.debug( "Gefunden: key: {0!r}, value: {1!r}".format( key, value ) )
                             if key in cur_object:
                                 self.logger.warn( "Doppelter Eintrag für Eigenschaft {0!r} von {1!r} in {2}({3}).".format(
-                                        key, object_type, file_name, row_num )
+                                        key, object_type, file_name, row_num ) )
                             else:
-                                cur_object[key] = ( value, file, row_num )
+                                cur_object[key] = ( value, file_name, row_num )
 
                 else:
 
@@ -309,7 +312,7 @@ class NagiosConfig(object):
                         in_block = True
                         cur_object  = {}
                         object_type = match.group(1).lower()
-                        cur_object['__object_definition__'] = ( file, row_num )
+                        cur_object['__object_definition__'] = ( file_name, row_num )
                         self.logger.debug( "Zeile {0} in {1}: Beginne Block vom Type {2!r}".format( row_num, file_name, object_type ) )
                         continue
 
diff --git a/bin/nagios/config.pyc b/bin/nagios/config.pyc
deleted file mode 100644
index ba01b13da679b2d16fadcae4af7cc5c7e4e72df4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 11525
zcmb_iO>Z1mc70V%HrW&@l9DKzGqP2ZC5x2Bmd5rVi7b!5D9egu+9}$mO<Qg>yNk^d
zn^nzv)e<R*2rvo|BnXg?)hvPlK^6g$MRq|FH~|7}0wkOKg8{P6#_IsdIp<Y3Nr?jl
z16uCK_g=m4ckj99-m3rnVQl1Y&;Igm!xaBj@b^9Z>^71n{`bs=F)RJNXI8vky>C|h
zUcO{jO1=DmSsCc%2hB>^G<_2dnKg7Qncp+!sWD%#44dYFi7Kic?AMNP!ll_VCXfFY
z|1IW|$S&4facVzIleM^YGt1Jfzg!PbKfuo(M-pM7S{#-YF3s|ponwQ#je<tIZf&rZ
zW<j*wh&p+kCN_wZAYYGdu$eZy?Wj6iLhF1ONv)RDH=|lDA5p<QM{!8SX4<ILW|1{}
ziG2&jtLy1zbagGOCmUCr(SxXcHPO=NJ3IM$np|CtlcMHoL%XSVc0!JG3_m-7r0kWw
zd=#1ed+u+SEwtVLMrQwZqmqenoJa>vj049p_~xl^rdNh|=s4~EGu%Wp%x5bVvyKxR
zQF=`2C@%#!v@*u4Y2sdR-^Wd}tjclI98zY&G*6o5u%4b!zM?!TN7UeyX&zH%$}~rn
zIc=I_%1oQ)ab;dI&2eRBO!OnuoX`kAHqA*@o>AoqRldyIJcS+G>qzeKBBS6@Hw*66
zJ2q-}lU7h~x1%grh?7<nG?8<sH-ATm+|BB|?rP5Kjq*lL@p2bqdA}}OZLGB#lo=mC
zw)_x3dk+atY1cDPAd<#B!O42&1`DXtF{|LKP%<|#2_Fuar|$VcziO~oHR!55mYu9y
z?rx#G*}>9n6es%AUbVS|k)l#-##v6~T#MULZ50x|SE8uq6b&|%h^DLeqegC}M<Hc4
z9A?7)YM4cxEacWh3f?Stta_a0nleqS<p^ZE&?Qb+t6jt_(o<6^dt>@{(mUxlI6GI*
zzdG~3K&F4%JVxlF$6H{=?`2B8%z(*zLSHl<QuiSf59?8d2ko)Z2(f1ucjdqM?3h%>
zGrPDzJRUVqO6tdzV5l+HavZ4B(k$0&siu%Hn`hmPJk6@oTPI8otL*z|adDRSGiQVO
z;Nt9BH)$-YID2unjf+mwx#pZ6wTTz|nr=qc)?4VfI7@KL$B;DYNt(ouq8g<@*SU9#
zIa@hYsTKDxS!k!N7W6{m(u(rCC`Or7fKQO6Xh59qa()~V1o7qvU)<7sOL-R6H$Sc?
zO{kYf_$bXb>v@h6caLs+6_lrXvstv(5rtf|CP<=(T6E4^Zmc`u?TvMGk`^a%UaP&q
zrJY7%{1aY<|4JtyX`|kRKkkkB4QhE$(<O0KKPPd}YUsD_*~dMX@IW?TA?jVTeHnEh
z$L+NU*A_R{gNISp1Rh11&7b{!mY+MfD1{2A*q7(oj8?lXnIoOYQS7#`Ls7d{`v@~w
zo~kKHm6+|T5_K*YR>eXnY^;DXNV)dOB4LQ<VZT9gM>1w(Trr?D37&nw8fC3$HG;4P
z3-uiE1OZO2z<4&J%>Yo9;1u%t`l?Oa-TXkK;6aoX^&C$!AqhyWV5U>g*CnKAq`d54
zRL>ggHHxx3NC^?ww{`?a7m`ri<z{IGC?MmW&W%^yKesngZ~{TJkWAdKm~;j(0&I}6
zb;n0Yf&~FC03MdKUb}$Kx8hZIeD#gI8^Jmy!2x4ro4u2yCF^F-zHe*<tB)R5f&clV
zJc!qm>f$V=XAiX((<BOCWz_{HyjuyVq$)gvqEszyH^p9#;IMQ_#F`}xZikT=zXIf*
zaYx1z<c&#(eu*36NsXEN!zLZWfk^HkUp$@XjxD{@uNo`_F%9}v<)X^TCXd(&sRvns
zc4C%k(3@!p^Un{AKCC;FSab4<;jAM{ab*B_P*fOZbUow&%<~}+z@;$fAiF*tc(I>*
zjA79mkJrkyF6*!{CA0mnv=|Hb{?Y8hLiMFa#2}sM?-h1NRh=Q@ZJqQaNdvS!_sb^T
zs{`9Y9h%-~R`_QcOl$hq$HlnESOv<39qbP7n@p4=eX~Cq&e~NSIBQj*AD$IwJ!qD=
zm}Q>#DA5q-jEh~8C9-W?`BE1;A2j3WP^#smJLo3Oz;+_QgTN$?z}rB%$ug?qF+`F=
z>hm~T&94AVlf(f^(28I!fk0Jh>St^9W^l>=2y<TwVw(pW<Vit78`6#(FjYe;i~z-%
z;WtBysCZx3W&-1O+NigI@{nf&IrkA2s>!u|8D)>S-~?X5CClM11=VWxIi6@Q<H4e%
z_J^qT^BY*4C4_}kNN2SBN-R4ZZDT)H+1T=2q{gtkZDOMQ1MLYEkOwA0r#)HtF=Qh5
z(>T%QVv9D8^=ZaSc$n|QR6MmZy<HnMNhz(MM5Ax+$Uq+fYJ{(0TAC8^byFHMV;-2E
zM_WATzvRCJ{Fw31dKbNNX$T(AYu=DIW`?{GAj=d=ve~fK4c-#>M`j_6d5Fx;X<9S~
zE;Q8;dCx2-=ga_<;r@t8r;O)83q3M%Q8t1E%3nb*Dc=L;(Rs7|W5US7y_4d501L>z
z<9l15nB`@_3m(IhdJ3lS6-tf@*a!=_3psY8|Dr6f<07K09kueFP!-Ncp%IW-X$4yZ
z&AJV4MQvyW1i3dB&0bJn#a@ibzF3^4rPn2=ohWg(fK|6Yl_M<S5C;?=gZ}^zce6%j
zDS>FTQycA3v5<0`^H`n3z;;J);aVT$wfVakS-y-ZmAup5gg5C|{F28@o^nK=Yo}J}
zI!Cb*$4+pO%*bcO-7ybPMRY+lg`hpaYcA>q$Fw!QdfYQSF4O?3(m`<aG60N?fr@Yj
zoRnZFj9E4`<bMqF1d{;xhARwCB*bM=z5=ljHRwMi82${x<ZKHD8!$6aA&6b)oU?JR
zZWl(YY+A5R>V{@Fgyp@`3=EM2UvF#J^BmS<{9Z#Yd6t4M`T!WJXRA@1M|mKeJBTuX
zC}1Ap)d|u8WGy79YI)Y*eQPhjTD`2;0`jlpP_QB<szS|$MSBuOw443*;p=nw`wsKf
z%X30W+zDs~F~o^vB(P|tn;ilbJ<3nMxcm9-ySEo_I!x-W3dyWkoG?$4*visw$4M%8
z8QU0+Q$1<)1QEV2vAW)Ym^UT$j@JB)Gmj$y7DBZW@WM^d&s>AT6@eKl;ps-SqnZcx
zb~n;Upg|}cfpmv&WBfnC&jv_LX$k=Ll0N|`I|0BN_s0E+(lm0X0Bw_paB%j52vRNp
z)k97|LAgbc^k}9aj$fc<pE%x5*6VF@NJOlX+;*}EmWuZ9Adw8}UF%FJ>EQtb`XJ5L
z;kv<s79I%?UN^GGt3y)ZBRC`-ey5(*H~$U;I&NL!8TCP&(kQL}7i6ICQ0MKxrbhE%
zfVI$l)Pu7P5R9Le0M5TJUmbc5Vg?nT1{zEg1)yr`gSr`rBXlwS4JbVz!s$3XeR%#D
z3M$uch*r?_>7q$lx#Scy`#>Y-|KqkW6`+IDZCy0W1e;-%kSp}`2KI5-Z5>cm;(9A$
zI0eER&{-zmC)=;eX?r{(k`ds)OO}Fs>3Sft@y!V9_@9bb_KG}6mF`{95LZTo=(~$f
zOQ}UR&GM+}w2cN7+F_k4ate5|x~_H#*EPI_n($*Lbb6#roApje_kPcCs5*<R#6<`I
z-8!lu5y6FH$>ob%|A3->2?^swXJI-{c+-fAzUm$K!68Z`PNc|h`o6~oKx*AtcWl8k
zEd-e*VS9Pl5~qV831HTL<oE%kLl0&kbrhoyjkldhXk7Kez4_+}0&T^BNhbmRVhAW;
zE^q5g{g$`>*;xf~>0)rM<yZ7VYnlo24XuT1`?LLPqlmk;eT22;y|tlw;oh|aYjc|5
zc)XSeqX<nAyZ5$!!18`D%Ud<r9?aBVUSEZNRY!E-3b+5=xiilUEZz1$(ba^51(OG*
z<jkJ8aPP0ow<WVXWOj$mZpCc>sd-X?7XN|Sg%5`2BlN+Zz~mte2iA71R|yvgu8U_z
zJ5)#45aBjgCm-k+S^^?mF=Eg-NsNd51W`hMQ}Nt&oh-Uyg5riWlDG8>Z+YwI_^o-%
z`{*BL$9bGEPvq!$TW|TxtT<_6M6rP+Q+h6e;yuewQw8lEBnP-4q57cmM~FxFLMNXh
zCcBX%B#oCCJyJNYcnTmLHXa*CWNfYF!epF*1#ol`__eeRbp>DBumaa_8Lqxyr_roW
zA>9no_2BWfa~a@(5ikXKonel00m7cb=ZsLns5CZey?JYPC&}yE>VR0Dh~4K|*M%Ka
zdRT97xcCF%BCImG%H(|}H<2h_cKg=ir{T>H-(R{JUSl0CI2mFQnpFIf(}(Byl$b^0
zTF;%Qq=*k`BHOu8kz5yI8933Vf|H;MS^5Bej9ez-RlkO(Mx^6k_Q}#T*Rs}9kR~}k
z#i_EWNgOri#4Of&(JV3Uqp*)$-@XH||ADd<eJ@qKQEwE+a@so%v>OLqp7Bp3o$A+}
zP~D8`NTyF4wgRd4X5l-b9vC?zUux1n<A^qQ!Z|<WJbwv%+&L*@3q$7UuwOV$-k#G`
zg8Bi7<Ol6@ni#);UW0W{Qu$#!$dtj-k&*R<$^!+U^^acnw=eiG%M16;_<(>XddoMB
zCv1xX#sDPY)e`1_xrT{$^%&q_J==h)1Ckj7NnC^tVR(!wioUP97y_gJKZY1I>3;#B
zF?vO#H-)vtK6Hj~jfkNE++jjo84vnQ9#o-hW{6@A^kH)d?C3YjHw1{u#K*a5;0_uB
zon#sQ&==&6bLpH058-tTm~R1sBg8@A8IG2l1pw}iR=`%#-OYd$GhiKfC_>{QhXcom
zYal<u#v3><z3#v+furt_1(v%2JG|q=T=0RG(FhkhsCX4RVraa~)5d^)Pq8(u)s2i4
zp44&o-pegy{Lrly7u7$IiG8hbZ^eNm^soWbFi@vB5j^Zku&NUj)!#wlP*r}905aH&
z^T457Gg@PeAFuNqYCi7-b?JY*2vhMA1kQ9d{7nu`OfCE&c|a}-M0}uU6u!qcEYT@a
zpb37^+q3Up|K_{%_b%h_d1cPey*qa~{EUs~k*vrSdwgw|Oz-hecCQB?M5O7#2Z%In
z1P{{9;PahM6g++dm~1D|W0B!<yDz+T9+kI>VAplTwRQ>wzY@rsLFp&#dkW3I)BYo@
zu;;8jz91N{6~J2CJD^(45}glQAYKR|<Z$Q;Uq_cOlGd~D+j-oIg6DhpmyK0%M~kyU
z@!vwPkZ)&&XwXPwKB~8E<YHbj4Il6+(I{MCLQ5gz6y9d8ZwtZ(iaG6?vrO(5h0!(m
zLD^1NXL|(QP52R$&zamnvS&J6kd3j9@Es&V{zf+|j!1?!PHL;XAen(;jvV(C{x&;M
zQnK`6E$MECbU;OW!%vu_)jtAz5UygJ|H04V+X^t<65?YFm+<{RalP!qCjN*AXOqz}
ze*zIQ<w`^T7}}t<cZ$4t;1xNaXT0eFJTLlBAig%_Uvlm!{XUvlp1uYA&=9ydHNXb3
z_3clEI)v>7kD=?gi!w|BXyz4<AcxoqOa(A%#$#v=p%wS70Wk;qE<->>8x(E`=!+Kt
z@We3N*1Q98L})I8MmaLxhg%>iN745mH@5x_toVGt5vGOL3`{N>$%Hvfb~IKMGo;RU
zfuBGskXkN9OcbVufbD|ZG9SRWf{5xnh-n%s?SL<RWnH{|i$yq*pxs;C3`V-K^)*<u
zt8{a#avqjy9u#{9{vyIdjPb)JXyV>`3Iv=L+ps^yRXqE1yjknO8C-MW#3gYr=kfDP
z1{WE8&fgcGS;zacFy(E|A^8}kc?XY<`YAq+u@OJAK%gQDa3!#$VoB6RxV#Uef~{-2
zvw*I-;9;CKi{SNYR0m8&dDW8LxzXJ#P<(i?ktV>|q9xw(#cS~+y)e|fP{tehGTJFA
zQQavzMbL$2^m#(~pjXxiI}QV=TVaP!$Y2^+MAUno?Vy1O{ji=TLK;QP6e!9Gt#w;F
z&_nOU-RL#jZ8Y#oJ%sE#MA$=00Yr>INsf)+RRtHyy*6?eaAg^A05lM*+_bGDK!E*g
za{y%DhH6@xDtf*Zf5eo1FhYOKKPQbJ@`s@HQwTjx`lpZ^SBRChQ~t|*<~Inu!}#&9
zwEb_8!H!|-pmFpvkvi@L1yl`HnjzB)B2v^0u?Tvs&@H6kd*}|GQjvZe95~Q5gtG9O
z?}FnijuDoN&VUN^EQ~!k5h7h+Zs<cdQRBLz3%x>(#J<)TWT!{JsE<UP?LAk$e15Ka
z`9k;}9>{20ZVxsRK91eBG#fPOvW76xG>nK`&b=$Cg)>GmeZhw5g*5|b5LdjgE=*Z<
zU%V51*(|!K8UAoe=ikV5@$w~$&WLdhvUm|cO_Nb_Jt)A=d{E|`QR*^xm&uV@lP!#h
z@9T=V2?CU3W)R;xlog^pi!dC+l#LQvQ8K7Pl8#|?fm{IcAsPgE$O2#s62dAF^a1zs
zRsw`z2CvoY2fk$l=py6(+?6{<Dp7Jm#{l;seIP05gZbo&kR+=Qr~fHX(@iHD&FNlo
zLguD}=r~E#u&!V7M!yrF+|75O69NM-bSh>6l~#u$sP`F<hAwdq-snDP2;NUx^;H*c
z|FQ?B{7Oqm{o>~lE*gsn{-feWV)!)%m4t}RhP3$N9sAnY3#hy!%G;lpuRQB+ZgR_O
zyYB#`6&WMlL>`|q;?1FeS0e4Odf%w*^y14>yZ<d`)slWXntf>NK+gc_)Xlxm544}y
zVzCalpYmygiPS@Jfwx#xaNrtp?rR1q1*w@(7JyA3y@E3S;+wVj!M+dMNXR&vBV51!
z7nb~pZ-?6P8V3Wmmf<m%y%EF{&p<a^Is^tb1Jq?Y=r7K`f~FxlnUG)*Qg__$-(Zf{
zrGV*kpVzq%i;hZ$k8zLiEE68HK0a{=#3Rs)((qm8_>Lj`l*w025+<umI!u1fggPE_
zD|<(x+^>Hw!~rhQUO|FWDV-^mOH=sqUuA6cRHa-Q8XX?JP?@ZptyC(fD%UFSj=o+w
zxlb0}M^{-zyJN+yX`8`bY{<7tIS--uzS0@Fs<?}&0B`+f?_*q<^N=riLoVy6_NXP@
UaNqC#j04NKAl}mZ=bs+<KaaL#%K!iX

diff --git a/bin/nagios/object/host.py b/bin/nagios/object/host.py
index d411827..168a972 100644
--- a/bin/nagios/object/host.py
+++ b/bin/nagios/object/host.py
@@ -9,13 +9,13 @@ import re
 from nagios.object.verify import NagiosVerifyError, verify_object_property
 
 #-----------------------------------------------------------------------
-def verfify( definition, logger )
+def verfify( definition, logger ):
     "Verifiziert einen übergebenen Definitionsblock als Nagios-Host."
 
     res = {}
     identifier = None
 
-"""
+    """
 define host{
    *host_name                       host_name
    *alias                           alias
@@ -77,7 +77,7 @@ define host{
     for key in definition:
         if not key in valid_keys:
             logger.warn( "Ungültige Eigenschaft {0!r} für Hostdefinition in {1}({2}).".format(
-                key, definition[key][1], definition[key][2] )
+                key, definition[key][1], definition[key][2] ) )
 
     # Einfache String-Eigenschaften
     for key in ( 'host_name', 'alias', 'address', 'display_name', 'check_period', 'event_handler', 'notification_period',
@@ -85,7 +85,7 @@ define host{
         if key in definition:
             try:
                 if key in res:
-                    logger.warn( "Double entry {0} for host definition in {1}({2}).".format( key, definition[key][1], definition[key][2] )
+                    logger.warn( "Double entry {0} for host definition in {1}({2}).".format( key, definition[key][1], definition[key][2] ) )
                 else:
                     res[key] = verify_object_property( definition[key][0], 'string' )
             except NagiosVerifyError as e:
@@ -94,15 +94,15 @@ define host{
     # Array-String-Eigenschaften
     for key in ( 'parents', 'hostgroups', 'contacts', 'contact_groups' ):
         if key in definition:
-            array = re.split( r',+', definition[key][0]
-            res[key] = array[]
+            array = re.split( r',+', definition[key][0] )
+            res[key] = array[:]
 
     if 'initial_state' in definition:
-        array = re.split( r',+', definition['initial_state'][0]
+        array = re.split( r',+', definition['initial_state'][0] )
         for value in array:
             if value not in ( 'o', 'd', 'u' ):
                 logger.warn( "Ungültiger Wert für 'initial_state' in {0}({1}) gegeben.".format(
-                        definition['initial_state'][1], definition['initial_state'][2] )
+                        definition['initial_state'][1], definition['initial_state'][2] ) )
 
     return ( identifier, res )
 
-- 
2.39.5