Skip to content

Commit

Permalink
Changes as per review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
root committed Aug 9, 2017
1 parent 2517627 commit 86426d2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
2 changes: 2 additions & 0 deletions config.py
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ def __init__(self):
self['SSH_DIR'] = os.getenv('SSH_DIR', '/tmp/ssh')
self['ARTIFACTS_DIR'] = os.getenv('ARTIFACTS_DIR', '/shippableci')
self['MAX_CONSOLES_SIZE_MB'] = os.getenv('MAX_CONSOLES_SIZE_MB', 16)
self['MAX_CONSOLES_SIZE_BYTES'] = self['MAX_CONSOLES_SIZE_MB'] * 1024 * 1024


for k, v in self.iteritems():
Expand All @@ -53,3 +54,4 @@ def __str__(self):
for k, v in self.iteritems():
print('{0} - {1}'.format(k, v))
return ''

Binary file modified dist/main/main
Binary file not shown.
3 changes: 2 additions & 1 deletion script_runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ def __init__(self, job_id, shippable_adapter, \
self.console_buffer = []
self.console_buffer_lock = threading.Lock()
self.continue_trigger_flush_console_output = True
self.max_consoles_size_in_bytes = self.config['MAX_CONSOLES_SIZE_MB'] * 1024 * 1024
self.max_consoles_size_in_bytes = self.config['MAX_CONSOLES_SIZE_BYTES']
self.flushed_consoles_size_in_bytes = flushed_consoles_size_in_bytes
self.sent_console_truncated_message = sent_console_truncated_message

Expand Down Expand Up @@ -367,3 +367,4 @@ def send_console_truncated_message(self):
}

self.shippable_adapter.post_job_consoles(self.job_id, console)

0 comments on commit 86426d2

Please sign in to comment.