Bugfix: las instancias de entrega a procesar deben haber vencido

[z.facultad/75.52/sercom.git] / start-sercom.py

diff --git a/start-sercom.py b/start-sercom.py
index 0ec9722ea7354561081132c546136bb0299d5b4e..6a3235bb2be6e77ff37713b965bd75e7ae287471 100644 (file)
--- a/start-sercom.py
+++ b/start-sercom.py
@@ -25,7 +25,7 @@ elif exists(join(dirname(__file__), "setup.py")):
 else:
     update_config(configfile="prod.cfg",modulename="sercom.config")
 
 else:
     update_config(configfile="prod.cfg",modulename="sercom.config")
 

-from sercom.model import InstanciaDeEntrega, hub
+from sercom.model import InstanciaDeEntrega, Entrega, AND, hub

 from sercom.finalizer import Finalizer
 from threading import Thread
 from datetime import datetime
 from sercom.finalizer import Finalizer
 from threading import Thread
 from datetime import datetime


@@ -42,7 +42,9 @@ class Queue(object): #{{{
             try:
                 hub.begin()
                 try:
             try:
                 hub.begin()
                 try:

-                    select = InstanciaDeEntrega.selectBy(inicio_proceso=None)
+                    select = InstanciaDeEntrega.select(AND(
+                        InstanciaDeEntrega.q.inicio_proceso == None,
+                        InstanciaDeEntrega.q.fin <= datetime.now()))

                     instancia = select.orderBy(InstanciaDeEntrega.q.fin)[0]
                     instancia.inicio_proceso = datetime.now()
                 finally:
                     instancia = select.orderBy(InstanciaDeEntrega.q.fin)[0]
                     instancia.inicio_proceso = datetime.now()
                 finally: