Skip to content
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

Jump to bottom

'circusctl options <watcher>' command -- output modification #1096

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

'circusctl options <watcher>' command -- output modification #1096

wants to merge 6 commits into from

Commits on Nov 19, 2018

  1. Merge pull request #3 from circus-tent/master 

    Merge pull request circus-tent#1089 from mercma/master
    @mercma
    mercma authored Nov 19, 2018
    Configuration menu
    Copy the full SHA
    251596a View commit details
    Browse the repository at this point in the history

  2. Change the 'circusctl options <watcher>' command output to 

    be representative of what is in the configuration (ini) file

This also removes some of the details that were output that
are for internal purposes (e.g. std[out|err|in]_stream dict)

example watcher:
[watcher:exec]
cmd = /usr/bin/python3
args = /root/circus/exec.py
stdout_stream.class = FileStream
stdout_stream.filename = /root/circus/logger.log
close_child_stderr = false
close_child_stdout = false
close_child_stdin = true
use_papa = true

old output:
error: command b'{"command":"options","properties":{"name":"exec"},"id":"6d93620716dd4555bcbc35181e5ded28"}': Object of type FileStream is not JSON serializable

new output:
args: /root/circus/exec.py
close_child_stderr: False
close_child_stdin: True
close_child_stdout: False
cmd: /usr/bin/python3
copy_env: False
env:
executable:
gid:
graceful_timeout: 30.0
max_age: 0
max_age_variance: 30
max_retry: 5
numprocesses: 1
on_demand: False
priority: 0
respawn: True
send_hup: False
shell: False
shell_args:
singleton: False
stdout_stream.class: FileStream
stdout_stream.filename: /root/circus/logger.log
stop_children: False
stop_signal: 15
uid:
use_papa: True
use_sockets: False
warmup_delay: 0
working_dir: /root/circus
    @mercma
    mercma committed Nov 19, 2018
    Configuration menu
    Copy the full SHA
    746c369 View commit details
    Browse the repository at this point in the history

  3. Update watcher.py

    @mercma
    mercma authored Nov 19, 2018
    Configuration menu
    Copy the full SHA
    6b7843d View commit details
    Browse the repository at this point in the history

  4. Update watcher.py

    @mercma
    mercma authored Nov 19, 2018
    Configuration menu
    Copy the full SHA
    509ca10 View commit details
    Browse the repository at this point in the history

  5. Update watcher.py

    @mercma
    mercma authored Nov 19, 2018
    Configuration menu
    Copy the full SHA
    a57e4bb View commit details
    Browse the repository at this point in the history

  6. Update watcher.py

    @mercma
    mercma authored Nov 19, 2018
    Configuration menu
    Copy the full SHA
    2018457 View commit details
    Browse the repository at this point in the history