]> git.mxchange.org Git - friendica.git/commitdiff
Merge pull request #3226 from annando/1702-only-worker
authorrabuzarus <rabuzarus@t-online.de>
Fri, 17 Mar 2017 12:22:23 +0000 (13:22 +0100)
committerGitHub <noreply@github.com>
Fri, 17 Mar 2017 12:22:23 +0000 (13:22 +0100)
The worker is now the only background processing system

1  2 
boot.php
mod/admin.php
view/templates/admin_site.tpl

diff --cc boot.php
Simple merge
diff --cc mod/admin.php
index e8c071113d097d9b8cc2d8bd0b6fe93cfc03ed3e,d599220d656c0b0d1e6eb5332847a19e45038686..b863eb909cd86cd50fbc4158d0ac06862696be24
@@@ -809,9 -803,8 +798,7 @@@ function admin_page_site_post(App $a) 
        set_config('system','temppath', $temppath);
        set_config('system','basepath', $basepath);
        set_config('system','proxy_disabled', $proxy_disabled);
 -      set_config('system','old_pager', $old_pager);
        set_config('system','only_tag_search', $only_tag_search);
-       set_config('system','worker', $worker);
        set_config('system','worker_queues', $worker_queues);
        set_config('system','worker_dont_fork', $worker_dont_fork);
        set_config('system','worker_fastlane', $worker_fastlane);
index e670222d4d2855dd8b31d813aa303e178dd7afc9,2faf64e2687768b9837c49fe06f7ba7b57218752..fdba195f1770fe29a4a0aa41e31e58947f5331cf
        {{include file="field_input.tpl" field=$optimize_max_tablesize}}
        {{include file="field_input.tpl" field=$optimize_fragmentation}}
        {{include file="field_input.tpl" field=$abandon_days}}
-       {{include file="field_input.tpl" field=$lockpath}}
        {{include file="field_input.tpl" field=$temppath}}
        {{include file="field_input.tpl" field=$basepath}}
 -      {{include file="field_checkbox.tpl" field=$suppress_language}}
        {{include file="field_checkbox.tpl" field=$suppress_tags}}
        {{include file="field_checkbox.tpl" field=$nodeinfo}}
        {{include file="field_input.tpl" field=$embedly}}