yohan/brie-aurore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

correction de quelques erreurs sur le scheduler : anniversary, try/catch, ...

Browse Source
This commit is contained in:
Romain Beuque 2014-09-02 20:26:52 +02:00
parent 1cb94e8b0a
commit fe01287064
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Brie/brie/controllers/scheduler.py
View File

@ -60,6 +60,10 @@ def disconnect_members_from_residence(admin_user, residence_dn):
machines = admin_user.ldap_bind.search(machine_dn, "(objectClass=organizationalRole)", scope = ldap.SCOPE_ONELEVEL) machines = admin_user.ldap_bind.search(machine_dn, "(objectClass=organizationalRole)", scope = ldap.SCOPE_ONELEVEL)
for machine in machines: for machine in machines:
dns = Machine.get_dns_by_id(admin_user, machine.dn) dns = Machine.get_dns_by_id(admin_user, machine.dn)
if dns is None:
print "[LOG] Suppression machine erreur (dns is None): " + machine.dn
continue
#end if
ip = IpReservation.get_ip(admin_user, residence_dn, dns.dlzData.first()) ip = IpReservation.get_ip(admin_user, residence_dn, dns.dlzData.first())
print("[LOG "+datetime.datetime.now().strftime("%Y-%m-%d %H:%M")+"] suppression machine " + Machine.get_dhcps(admin_user, machine.dn)[0].get("dhcpHWAddress").values[0] + " pour l'utilisateur "+ member.dn + " par le scheduler") print("[LOG "+datetime.datetime.now().strftime("%Y-%m-%d %H:%M")+"] suppression machine " + Machine.get_dhcps(admin_user, machine.dn)[0].get("dhcpHWAddress").values[0] + " pour l'utilisateur "+ member.dn + " par le scheduler")
#sys.stdout.flush() #sys.stdout.flush()
@ -87,7 +91,11 @@ def disconnect_members_job():
for residence in residences: for residence in residences:
print "Disconnect job on : " + residence.uniqueMember.first() print "Disconnect job on : " + residence.uniqueMember.first()
disconnect_members_from_residence(user, residence.uniqueMember.first()) try:
disconnect_members_from_residence(user, residence.uniqueMember.first())
except Exception as inst:
print "[LOG "+datetime.datetime.now().strftime("%Y-%m-%d %H:%M")+"] Exception sur le scheduler ("+ residence.uniqueMember.first() +")"
print type(inst)
#end for #end for
# user.ldap_bind.disconnect() # user.ldap_bind.disconnect()

4
Brie/brie/lib/aurore_helper.py
View File

@ -151,6 +151,10 @@ class CotisationComputes:
anniversary_year = resultat[0].year + 1 anniversary_year = resultat[0].year + 1
anniversary = datetime.datetime.strptime(str(anniversary_year) + "-" + str(anniversary_month) + "-1 0:0", "%Y-%m-%d %H:%M") + datetime.timedelta(days=(anniversary_day - 1)) anniversary = datetime.datetime.strptime(str(anniversary_year) + "-" + str(anniversary_month) + "-1 0:0", "%Y-%m-%d %H:%M") + datetime.timedelta(days=(anniversary_day - 1))
#end for #end for
if anniversary == 0:
anniversary = datetime.datetime(1999, 1, 31, 12, 0)
return anniversary return anniversary
#end def #end def