Skip to content

164 log the topic #177

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.

Sign up for GitHub

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

Merged
merged 14 commits into from
Aug 9, 2022
Merged

164 log the topic #177

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
3652cab
Add logging of destination queue to agents.py
jounaidr Aug 16, 2021
70f4015
Move sender destination logging out of else clause
jounaidr Aug 17, 2021
ee9c0e9
Refactor destination checking block
jounaidr Aug 17, 2021
8abfbd8
Rename destination_helper to check_destination
jounaidr Aug 17, 2021
958401b
Remove destination queue logging from agents.py
jounaidr Sep 1, 2021
b6c6efe
Remove subscription as just logging is needed
jounaidr Sep 2, 2021
3f932b7
Update logging
jounaidr Sep 4, 2021
b2e6693
Revert check_destination() to how it was before
jounaidr Sep 4, 2021
0ed8766
Change wording in log messages to match actions
jounaidr Jan 17, 2022
46756d1
Make the use of pkg_resources optional
tofu-rocketry Aug 2, 2022
cec1844
Revert "Make the use of pkg_resources optional"
tofu-rocketry Aug 3, 2022
db87cb0
Split long line
tofu-rocketry Aug 2, 2022
0b7da38
Add setuptools as explicit dependency
tofu-rocketry Aug 3, 2022
d9711a3
Tidy up requirements file
tofu-rocketry Aug 3, 2022
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
2 changes: 1 addition & 1 deletion apel-ssm.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ BuildArch: noarch
BuildRequires: python-devel
%endif

Requires: stomppy < 5.0.0, python-ldap < 3.4.0, openssl
Requires: stomppy < 5.0.0, python-ldap < 3.4.0, python-setuptools, openssl
Requires(pre): shadow-utils

%define ssmconf %_sysconfdir/apel
Expand Down
7 changes: 3 additions & 4 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
# Base requirements for ssm

argo-ams-library
stomp.py<5.0.0
python-daemon<=2.3.0 # 2.3.1 dropped support for Python 2
python-ldap<3.4.0 # python-ldap-3.4.0 dropped support for Python 2
setuptools # Required for pkg_resources (also happens to be a dependency of python-ldap)

# Dependencies for optional dirq based sending
dirq

# Dependencies for experimental AMS functionality

argo-ams-library
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def main():
download_url='https://github.com/apel/ssm/releases',
license='Apache License, Version 2.0',
install_requires=[
'stomp.py<5.0.0', 'python-ldap<3.4.0',
'stomp.py<5.0.0', 'python-ldap<3.4.0', 'setuptools',
],
extras_require={
'AMS': ['argo-ams-library'],
Expand Down
13 changes: 12 additions & 1 deletion ssm/ssm2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
"""
from __future__ import print_function

import pkg_resources

from ssm import crypto
from ssm.message_directory import MessageDirectory

Expand Down Expand Up @@ -549,7 +551,16 @@ def handle_connect(self):
connect to each in turn until successful.
"""
if self._protocol == Ssm2.AMS_MESSAGING:
log.debug('handle_connect called for AMS, doing nothing.')
log.info("Using AMS version %s",
pkg_resources.get_distribution('argo_ams_library').version)

log.info("Will connect to %s", self._brokers[0])

if self._dest is not None:
log.info('Will send messages to: %s', self._dest)

if self._listen is not None:
log.info('Will subscribe to: %s', self._listen)
return

log.info("Using stomp.py version %s.%s.%s.", *stomp.__version__)
Expand Down