From 4b21e8ccbd2e9f47f7e497d962fcadb57c509e8f Mon Sep 17 00:00:00 2001 From: salles Date: Tue, 21 Mar 2006 21:34:18 +0100 Subject: [PATCH] Les temps compars en GMT a devrait arranger un peu nos affaires. darcs-hash:20060321203418-72cb0-6576261ee1a38e92149534966dfdb8a16c364f2a.gz --- gestion/gen_confs/generate.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gestion/gen_confs/generate.py b/gestion/gen_confs/generate.py index 124e6d29..b929e715 100755 --- a/gestion/gen_confs/generate.py +++ b/gestion/gen_confs/generate.py @@ -20,7 +20,7 @@ sys.path.append('/usr/scripts/gestion') from ldap_crans import crans_ldap, crans, hostname, invite from lock import * from affich_tools import anim, cprint, OK -from time import localtime, strftime, time, sleep +from time import localtime, strftime, time, sleep, timezone import config from inspect import getargspec @@ -41,7 +41,8 @@ class base_reconfigure : 'blacklist_upload' : [ 'sila-blacklist_upload', 'komaz-blacklist' ] , 'blacklist_p2p' : [ 'sila-blacklist_p2p', 'komaz-blacklist' ] , 'blacklist_autodisc_upload' : [ 'sila-blacklist_autodisc_upload', 'komaz-blacklist'] , - 'blacklist_autodisc_p2p' : [ 'sila-blacklist_autodisc_p2p' , 'komaz-blacklist'] } + 'blacklist_autodisc_p2p' : [ 'sila-blacklist_autodisc_p2p' , 'komaz-blacklist'] + } def __init__(self,to_do=[]) : if not to_do : @@ -56,12 +57,12 @@ class base_reconfigure : for nom in to_add : for t in serv.start : db.services_to_restart(nom,serv.args,t) - if time() > t : + if time()-timezone > t : to_do[nom] = serv.args db.services_to_restart('-' + serv.nom) else : for t in serv.start : - if time() > t : + if time()-timezone > t : to_do[serv.nom] = serv.args break else :