2010/12/27 Grégory Starck <g.sta...@gmail.com>
> 2010/12/27 nap <napar...@gmail.com>
>
> Hi,
>>
>> Thanks a lot, all theses patches are commited, it's far more easy to read
>> now :)
>> I love when we delete code :)
>>
>
> we should all :p
>
>
> By the way ,the last one got a typo (self in the wrapper).
>
>
> damn yes :/ I guess I had some vapor still in my head since a day or 2 ;)
>
:)
>
> and so now I also see in satellitelink I've apparently weirdly replaced
> conf timeout variables with hard coded values (I guess I had an old version
> of the file or something like that but well.. anyway ;)) ; so here the small
> fix for it :
>
> (master)g...@brutus:~/Documents/Projets/shinken$ git diff
> diff --git a/shinken/satellitelink.py b/shinken/satellitelink.py
> index 137bcce..aae9129 100644
> --- a/shinken/satellitelink.py
> +++ b/shinken/satellitelink.py
> @@ -70,7 +70,7 @@ class SatelliteLink(Item):
> def create_connexion(self):
> self.uri = shinken.pyro_wrapper.create_uri(self.address,
> self.port, "ForArbiter")
> self.con = shinken.pyro_wrapper.getProxy(self.uri)
> - shinken.pyro_wrapper.set_timeout(self.con, 5)
> + shinken.pyro_wrapper.set_timeout(self.con, self.timeout)
>
>
> def put_conf(self, conf):
> @@ -79,9 +79,9 @@ class SatelliteLink(Item):
> #print "Connexion is OK, now we put conf", conf
> #print "Try to put conf:", conf
> try:
> - shinken.pyro_wrapper.set_timeout(self.con, 120)
> + shinken.pyro_wrapper.set_timeout(self.con, self.data_timeout)
> self.con.put_conf(conf)
> - shinken.pyro_wrapper.set_timeout(self.con, 5)
> + shinken.pyro_wrapper.set_timeout(self.con, self.timeout)
> return True
> except Pyro.errors.URIError , exp:
> self.con = None
> (master)g...@brutus:~/Documents/Projets/shinken$
>
Thanks it's fixed :)
>
>
>
> Did you use the test_end_to_end.sh script? It is done for a quick test for
>> patches.
>
>
> and nope :/ I'm trying it now.. and get a small problem :
>
> how I tested:
> (0: git status : working directory clean)
> 1) python setup.py build
> 2) sudo python setup.py install
> 3) sudo chown shinken:shinken ~/Documents/Projets/shinken
> ## I'm doing dev with my own user but here I've to apply shinken user
> totally to my dev dir because if not I'm getting permission denied errors on
> some of the files when doing the test :s
> 4) sudo python tests/test_end_to_end.sh
>
> but it fails lately with :
>
> """
> ...
> Check for 3 brokers (one master, one for livestatus.dat, one for log)
> Ok, got 3 broker
> File var/brokerd.pid is present.
> Check for 1 arbiter
> Ok, got 1 arbiter
> Error : File var/arbiterd.pid is missing!
> """
>
> apparently the test_end_to_end.sh is mixing (maybe not itself) the "var"
> path with where is placed my dev directory ; (or else it's my config that
> could have been changed but as far as I know I'm using all defaults (I've
> not changed anything in the setup/config)):
>
> (master)g...@brutus:~/Documents/Projets/shinken$ ls -lta
> /usr/local/shinken/var/
> total 48
> -rw-rw-rw- 1 shinken shinken 19910 2010-12-27 13:10 nagios.log
> drwxr-xr-x 3 shinken shinken 4096 2010-12-27 13:06 .
> -rw-r--r-- 1 shinken shinken 5120 2010-12-27 13:06 livestatus.db
> *-rw-rw-rw- 1 shinken shinken 4 2010-12-27 13:05 arbiterd.pid*
> drwxr-xr-x 2 shinken shinken 4096 2010-12-27 13:05 rw
> -rw-rw-rw- 1 shinken shinken 4 2010-11-09 17:04 schedulerd.pid
> drwxr-xr-x 19 shinken shinken 4096 2010-11-09 17:00 ..
> -rw-r--r-- 1 shinken shinken 0 2010-07-31 12:14 void_for_git
> (master)g...@brutus:~/Documents/Projets/shinken$
>
> (master)g...@brutus:~/Documents/Projets/shinken$ ls -lta var/
> total 24
> drwxr-xr-x 2 shinken shinken 4096 2010-12-27 13:05 .
> -rw-rw-rw- 1 shinken shinken 4 2010-12-27 13:05 brokerd.pid
> -rw-rw-rw- 1 shinken shinken 4 2010-12-27 13:05 pollerd.pid
> -rw-rw-rw- 1 shinken shinken 4 2010-12-27 13:05 reactionnerd.pid
> -rw-rw-rw- 1 shinken shinken 4 2010-12-27 13:05 schedulerd.pid
> drwxr-xr-x 16 shinken shinken 4096 2010-12-27 13:03 ..
> -rw-r--r-- 1 shinken shinken 0 2010-08-18 23:44 void_for_git
> (master)g...@brutus:~/Documents/Projets/shinken$
>
> Hum yes.... in my server and in our integration server, the directory is
the same, that's why we do not have this problem. I'll look if we can solve
this.
>
> .. :s
>
>
> But beware, it will "clean" installed shinken, so don't use it if you have
>> a real installation in your host :p
>>
>
> no prob I'm not using any "prod" installation @home ;)
>
> thx Jean.
>
> Thanks to you for the patches :)
Jean
> greg.
>
>
>
> ------------------------------------------------------------------------------
> Learn how Oracle Real Application Clusters (RAC) One Node allows customers
> to consolidate database storage, standardize their database environment,
> and,
> should the need arise, upgrade to a full multi-node Oracle RAC database
> without downtime or disruption
> http://p.sf.net/sfu/oracle-sfdevnl
> _______________________________________________
> Shinken-devel mailing list
> Shinken-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/shinken-devel
>
>
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Shinken-devel mailing list
Shinken-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/shinken-devel
