diff options
| author | Dirk Brenken <dev@brenken.org> | 2018-11-04 13:36:29 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-04 13:36:29 +0100 |
| commit | 8e00bab16676bcb4e46d80a7403cb9d677437443 (patch) | |
| tree | 4f1bd9fb66fa9cfd72d66a1be9703ffe963d24d5 | |
| parent | c1f2405d33bdf06827ddc8189459809942ae0677 (diff) | |
| parent | ada93c69f05babb1199b82984acfbf7125b1ad6a (diff) | |
Merge pull request #7257 from jonathanunderwood/stubby_fix_init
stubby: fix loading of config file
| -rwxr-xr-x | net/stubby/files/stubby.init | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/net/stubby/files/stubby.init b/net/stubby/files/stubby.init index af75770a7..104248acb 100755 --- a/net/stubby/files/stubby.init +++ b/net/stubby/files/stubby.init @@ -157,7 +157,6 @@ start_service() { local manual local log_level local command_line_arguments - local stubby_args mkdir -p "$stubby_config_dir" @@ -173,16 +172,9 @@ start_service() { mv "$config_file_tmp" "$stubby_config" fi - stubby_args="" config_get command_line_arguments "global" command_line_arguments "" - if [ -n "$command_line_arguments" ]; then - stubby_args="$command_line_arguments" - fi config_get log_level "global" log_level "" - if [ -n "$log_level" ]; then - stubby_args="$stubby_args -v$log_level" - fi if [ $("${stubby_init}" enabled; printf "%u" ${?}) -eq 0 ]; then if [ -n "${stubby_boot}" ]; then @@ -192,7 +184,13 @@ start_service() { fi fi procd_open_instance "stubby" - procd_set_param command "$stubby" "$stubby_args" -C "$stubby_config" + procd_set_param command "$stubby" -C "$stubby_config" + if [ -n "$log_level" ]; then + procd_append_param command -v "$log_level" + fi + if [ -n "$command_line_arguments" ]; then + procd_append_param command "$command_line_arguments" + fi procd_set_param respawn ${respawn_threshold:-3600} ${respawn_timeout:-5} ${respawn_retry:-5} procd_set_param file "$stubby_config" procd_set_param stdout 1 |