Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix/server log #3244

Merged
merged 31 commits into from
Oct 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
168a5ca
server name space fix
andre-merzky Jul 9, 2024
a68dce2
pass logger
andre-merzky Jul 9, 2024
d9579f2
merge from devel
andre-merzky Jul 12, 2024
9664917
merge from devel
andre-merzky Jul 20, 2024
10d3771
merge from devel
andre-merzky Jul 25, 2024
3975b0e
merge from devel
andre-merzky Jul 26, 2024
ad42f3f
merge from devel
andre-merzky Aug 15, 2024
e45fa7f
merge from devel
andre-merzky Aug 20, 2024
704c4e6
merge from devel
andre-merzky Aug 20, 2024
c04aad6
merge from devel
andre-merzky Aug 21, 2024
cb749bd
merge from devel
andre-merzky Aug 28, 2024
5f7f263
merge from devel
andre-merzky Aug 28, 2024
5118793
merge from devel
andre-merzky Sep 2, 2024
7a3d99f
merge from devel
andre-merzky Sep 3, 2024
d990ce0
merge from devel
andre-merzky Sep 3, 2024
b180195
merge from devel
andre-merzky Sep 4, 2024
2e1c7b2
merge from devel
andre-merzky Sep 19, 2024
e431774
merge from devel
andre-merzky Sep 19, 2024
306390f
merge from devel
andre-merzky Sep 19, 2024
3e20c8d
merge from devel
andre-merzky Oct 1, 2024
1aa4db0
merge from devel
andre-merzky Oct 1, 2024
3a47523
merge from devel
andre-merzky Oct 1, 2024
81b5957
merge from devel
andre-merzky Oct 7, 2024
d5fcdd2
merge from devel
andre-merzky Oct 7, 2024
510a366
merge from devel
andre-merzky Oct 7, 2024
0c03e22
merge from devel
andre-merzky Oct 14, 2024
f20439f
merge from devel
andre-merzky Oct 15, 2024
7dd762a
merge from devel
andre-merzky Oct 18, 2024
bab0fe8
merge from devel
andre-merzky Oct 21, 2024
7ac2c3b
merge from devel
andre-merzky Oct 22, 2024
9bc1425
Merge branch 'devel' into fix/server_log
mtitov Oct 25, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/radical/pilot/proxy.py
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,8 @@ def __init__(self, path=None):
self._lock = mt.Lock()
self._clients = dict()

ru.zmq.Server.__init__(self, url='tcp://*:10000+', path=path)
ru.zmq.Server.__init__(self, uid='radical.pilot.proxy',
url='tcp://*:10000+', path=path)

self._monitor_thread = mt.Thread(target=self._monitor)
self._monitor_thread.daemon = True
Expand Down
2 changes: 1 addition & 1 deletion src/radical/pilot/session.py
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ def _start_proxy(self):

# configure proxy channels
try:
self._proxy = ru.zmq.Client(url=self._cfg.proxy_url)
self._proxy = ru.zmq.Client(url=self._cfg.proxy_url, log=self._log)
self._proxy_cfg = self._proxy.request('register', {'sid':self._uid})

except:
Expand Down
Loading