FAELIX/incident_handler
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

always try adding the event file

Browse Source
This commit is contained in:
Marek Isalski
2018-06-25 00:11:38 +02:00
parent ab93e34a67
commit 561881ff33
1 changed files with 14 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fih.py
View File

@ -88,7 +88,6 @@ def mattermost_incident_command( command, args, channel_id, raw_incident_number,
'message': "#### Written `%s`:\n\n```\n%s```" % ( ev.path_short(), written ), 'message': "#### Written `%s`:\n\n```\n%s```" % ( ev.path_short(), written ),
} ) } )
if new:
cmdline = app.config[ "MERCURIAL_BIN" ] + " add " + ev.path_short() cmdline = app.config[ "MERCURIAL_BIN" ] + " add " + ev.path_short()
message = exec_to_message( cmdline ) message = exec_to_message( cmdline )
if message: if message:
@ -96,14 +95,7 @@ def mattermost_incident_command( command, args, channel_id, raw_incident_number,
'message': message, 'message': message,
} ) } )
cmdline = app.config[ "MERCURIAL_BIN" ] + " commit -m 'add event for incident " + raw_incident_number + " via FIH' " + ev.path_short() cmdline = app.config[ "MERCURIAL_BIN" ] + " commit -m 'event for incident " + raw_incident_number + " via FIH' " + ev.path_short()
message = exec_to_message( cmdline )
if message:
app.mm.posts.create_post( options = { 'channel_id': channel_id,
'message': message,
} )
else:
cmdline = app.config[ "MERCURIAL_BIN" ] + " commit -m 'update event for incident " + raw_incident_number + " via FIH' " + ev.path_short()
message = exec_to_message( cmdline ) message = exec_to_message( cmdline )
if message: if message:
app.mm.posts.create_post( options = { 'channel_id': channel_id, app.mm.posts.create_post( options = { 'channel_id': channel_id,
@ -365,10 +357,10 @@ def exec_to_message( cmdline ):
stdout = strip_progress( strip_ansi( process.stdout.read().decode( 'ascii', 'ignore' ) ) ) stdout = strip_progress( strip_ansi( process.stdout.read().decode( 'ascii', 'ignore' ) ) )
if stdout: if stdout:
results += "\n\n```\n" + stdout.replace( "```", "` ` `" ) + "```\n" results += "\n\n`````````\n" + stdout + "`````````\n"
stderr = strip_progress( strip_ansi( process.stderr.read().decode( 'ascii', 'ignore' ) ) ) stderr = strip_progress( strip_ansi( process.stderr.read().decode( 'ascii', 'ignore' ) ) )
if stderr: if stderr:
results += "\n\n```\n" + stderr.replace( "```", "` ` `" ) + "```\n" results += "\n\n`````````\n" + stderr + "`````````\n"
if not stdout and not stderr: if not stdout and not stderr:
results += '_no output_\n' results += '_no output_\n'
return results return results