Subversion Repositories SmartDukaan

Rev

Rev 16941 | Rev 17029 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 16941 Rev 17027
Line 552... Line 552...
552
 
552
 
553
class RetailerDetail():
553
class RetailerDetail():
554
    global RETAILER_DETAIL_CALL_COUNTER
554
    global RETAILER_DETAIL_CALL_COUNTER
555
    def getRetryRetailer(self,failback=True):
555
    def getRetryRetailer(self,failback=True):
556
        status = RETRY_MAP.get(self.callType)
556
        status = RETRY_MAP.get(self.callType)
557
        retailer = session.query(Retailers).filter_by(status=status).filter(Retailers.next_call_time<=datetime.now()).order_by(Retailers.call_priority).order_by(Retailers.next_call_time).with_lockmode("update").first()
557
        retailer = session.query(Retailers).filter_by(status=status).filter(or_(Retailers.agent_id==self.agentId, Retailers.agent_id==None)).filter(Retailers.next_call_time<=datetime.now()).order_by(Retailers.call_priority).order_by(Retailers.next_call_time).with_lockmode("update").first()
558
        if retailer is not None:
558
        if retailer is not None:
559
            lgr.info( "getRetryRetailer " + str(retailer.id))
559
            lgr.info( "getRetryRetailer " + str(retailer.id))
560
        else:
560
        else:
561
            if failback:
561
            if failback:
562
                retailer = self.getNewRetailer(False)
562
                retailer = self.getNewRetailer(False)