From d68f365ee5b4a6d167b33353e9c1034eb7c80d0b Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Tue, 21 May 2013 18:13:29 -0400 Subject: [PATCH] Fix too-long subjects sent by git and nagios integrations (imported from commit 9bf3af613b07fb7c72125eee0d08fd4a16dfa88a) --- integrations/git/post-receive | 2 +- integrations/nagios/nagios-notify-humbug | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/integrations/git/post-receive b/integrations/git/post-receive index eb2bc2e..988eb63 100755 --- a/integrations/git/post-receive +++ b/integrations/git/post-receive @@ -76,7 +76,7 @@ def git_commit_range(oldrev, newrev): for ln in subprocess.check_output(log_cmd).splitlines(): email, subject = ln.split(None, 1) if len(subject) > 60: - subject = subject[:58].rstrip() + '...' + subject = subject[:57].rstrip() + '...' commits += '!gravatar(%s) %s\n' % (email, subject) return commits diff --git a/integrations/nagios/nagios-notify-humbug b/integrations/nagios/nagios-notify-humbug index 2f64f78..66309ba 100755 --- a/integrations/nagios/nagios-notify-humbug +++ b/integrations/nagios/nagios-notify-humbug @@ -34,6 +34,8 @@ else: thing = 'service' msg['subject'] = 'service %s on %s' % (opts.service, opts.host) +if len(msg['subject']) > 60: + msg['subject'] = msg['subject'][0:57].rstrip() + "..." # e.g. **PROBLEM**: service is CRITICAL msg['content'] = '**%s**: %s is %s' % (opts.type, thing, opts.state)