##// END OF EJS Templates
Don't set explicit IDENTITY for clients...
MinRK -
Show More
@@ -466,7 +466,7 b' class Client(HasTraits):'
466 466 self.session = Session(**extra_args)
467 467
468 468 self._query_socket = self._context.socket(zmq.DEALER)
469 self._query_socket.setsockopt(zmq.IDENTITY, self.session.bsession)
469
470 470 if self._ssh:
471 471 tunnel.tunnel_connection(self._query_socket, url, sshserver, **ssh_kwargs)
472 472 else:
@@ -607,29 +607,21 b' class Client(HasTraits):'
607 607 ident = self.session.bsession
608 608 if content.mux:
609 609 self._mux_socket = self._context.socket(zmq.DEALER)
610 self._mux_socket.setsockopt(zmq.IDENTITY, ident)
611 610 connect_socket(self._mux_socket, content.mux)
612 611 if content.task:
613 612 self._task_scheme, task_addr = content.task
614 613 self._task_socket = self._context.socket(zmq.DEALER)
615 self._task_socket.setsockopt(zmq.IDENTITY, ident)
616 614 connect_socket(self._task_socket, task_addr)
617 615 if content.notification:
618 616 self._notification_socket = self._context.socket(zmq.SUB)
619 617 connect_socket(self._notification_socket, content.notification)
620 618 self._notification_socket.setsockopt(zmq.SUBSCRIBE, b'')
621 # if content.query:
622 # self._query_socket = self._context.socket(zmq.DEALER)
623 # self._query_socket.setsockopt(zmq.IDENTITY, self.session.bsession)
624 # connect_socket(self._query_socket, content.query)
625 619 if content.control:
626 620 self._control_socket = self._context.socket(zmq.DEALER)
627 self._control_socket.setsockopt(zmq.IDENTITY, ident)
628 621 connect_socket(self._control_socket, content.control)
629 622 if content.iopub:
630 623 self._iopub_socket = self._context.socket(zmq.SUB)
631 624 self._iopub_socket.setsockopt(zmq.SUBSCRIBE, b'')
632 self._iopub_socket.setsockopt(zmq.IDENTITY, ident)
633 625 connect_socket(self._iopub_socket, content.iopub)
634 626 self._update_engines(dict(content.engines))
635 627 else:
@@ -585,7 +585,7 b' class Hub(SessionFactory):'
585 585 self.log.info("queue::client %r submitted request %r to %s", client_id, msg_id, eid)
586 586 # Unicode in records
587 587 record['engine_uuid'] = queue_id.decode('ascii')
588 record['client_uuid'] = client_id.decode('ascii')
588 record['client_uuid'] = msg['header']['session']
589 589 record['queue'] = 'mux'
590 590
591 591 try:
@@ -677,7 +677,7 b' class Hub(SessionFactory):'
677 677 return
678 678 record = init_record(msg)
679 679
680 record['client_uuid'] = client_id.decode('ascii')
680 record['client_uuid'] = msg['header']['session']
681 681 record['queue'] = 'task'
682 682 header = msg['header']
683 683 msg_id = header['msg_id']
@@ -1205,6 +1205,7 b' class Hub(SessionFactory):'
1205 1205 self.db.add_record(msg_id, init_record(msg))
1206 1206 except Exception:
1207 1207 self.log.error("db::DB Error updating record: %s", msg_id, exc_info=True)
1208 return finish(error.wrap_exception())
1208 1209
1209 1210 finish(dict(status='ok', resubmitted=resubmitted))
1210 1211
General Comments 0
You need to be logged in to leave comments. Login now