ansible/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2024-09-14 20:13:21 +02:00
Code Releases Activity

removed print entries, corrected display calls to match latest devel

Browse source
This commit is contained in:
Brian Coca 2015-11-16 11:35:10 -08:00
parent 2c275ee1fc
commit 83f7942dcf
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
lib/ansible/plugins/callback/logentries.py
View file

@ -124,7 +124,7 @@ class PlainTextSocketAppender(object):
return return
except Exception: except Exception:
if self.verbose: if self.verbose:
print("Unable to connect to Logentries") self._display.warning("Unable to connect to Logentries")
root_delay *= 2 root_delay *= 2
if (root_delay > self.MAX_DELAY): if (root_delay > self.MAX_DELAY):
@ -163,9 +163,10 @@ class PlainTextSocketAppender(object):
try: try:
import ssl import ssl
HAS_SSL=True
except ImportError: # for systems without TLS support. except ImportError: # for systems without TLS support.
SocketAppender = PlainTextSocketAppender SocketAppender = PlainTextSocketAppender
print("Unable to import ssl module. Will send over port 80.") HAS_SSL=False
else: else:
class TLSSocketAppender(PlainTextSocketAppender): class TLSSocketAppender(PlainTextSocketAppender):
@ -197,14 +198,17 @@ class CallbackModule(CallbackBase):
def __init__(self): def __init__(self):
super(CallbackModule, self).__init__() super(CallbackModule, self).__init__()
if not HAS_SSL:
self._display.warning("Unable to import ssl module. Will send over port 80.")
if not HAS_CERTIFI: if not HAS_CERTIFI:
self.disabled =True self.disabled =True
self.display.warning('The `certifi` python module is not installed. ' self._display.warning('The `certifi` python module is not installed. '
'Disabling the Logentries callback plugin.') 'Disabling the Logentries callback plugin.')
if not HAS_FLATDICT: if not HAS_FLATDICT:
self.disabled =True self.disabled =True
self.display.warning('The `flatdict` python module is not installed. ' self._display.warning('The `flatdict` python module is not installed. '
'Disabling the Logentries callback plugin.') 'Disabling the Logentries callback plugin.')
config_path = os.path.abspath(os.path.dirname(__file__)) config_path = os.path.abspath(os.path.dirname(__file__))
@ -253,8 +257,7 @@ class CallbackModule(CallbackBase):
self.token = os.getenv('LOGENTRIES_ANSIBLE_TOKEN') self.token = os.getenv('LOGENTRIES_ANSIBLE_TOKEN')
if self.token is None: if self.token is None:
self.disabled = True self.disabled = True
self._display.warning( self._display.warning('Logentries token could not be loaded. The logentries token can be provided using the `LOGENTRIES_TOKEN` environment variable')
'Logentries token could not be loaded. The logentries token can be provided using the `LOGENTRIES_TOKEN` environment variable')
self.flatten = os.getenv('LOGENTRIES_FLATTEN') self.flatten = os.getenv('LOGENTRIES_FLATTEN')
if self.flatten is None: if self.flatten is None: