Merge pull request #1650 from ikedas/issue-1649 by ikedas

Deprecate "System log" setting in Listmaster Admin menu (#1649)
sympa-community · Jun 13, 2023 · 9491f4e · 9491f4e
2 parents 8dd4baf + 6151190
commit 9491f4e
Showing 3 changed files with 2 additions and 53 deletions.
diff --git a/default/web_tt2/nav.tt2 b/default/web_tt2/nav.tt2
@@ -87,10 +87,6 @@
                     <li class="[% class %]">
                         <a href="[% 'serveradmin/archives' | url_rel %]">[%|loc%]Archives[%END%]</a>
                     </li>
-                [% IF subaction == 'logs' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
-                    <li class="[% class %]">
-                        <a href="[% 'serveradmin/logs' | url_rel %]">[%|loc%]System log[%END%]</a>
-                    </li>
                 [% IF subaction == 'templates' %][% SET class = 'active' %][% ELSE %][% SET class = '' %][% END %]
                     <li class="[% class %]">
                         <a href="[% 'serveradmin/templates' | url_rel %]">[%|loc%]Templates[%END%]</a>

diff --git a/default/web_tt2/serveradmin.tt2 b/default/web_tt2/serveradmin.tt2
@@ -160,28 +160,6 @@
     </form>
 [% END %]
 
-[% IF subaction == 'logs' %]
-    <h2>[%|loc%]System log[%END%]</h2>
-    <h3>[%|loc%]Sympa log level[%END%]</h3>
-    <p>[%|loc%]Set debug level for logs written to disk.  This setting is temporary, applying only for the lifetime of the fastcgi session hosting this interface.[%END%]</p>
-    <form class="bold_label" action="[% path_cgi %]" method="post">
-        <fieldset>
-            [%|loc%]Log level:[%END%]
-            <input id="log_level_0" type="radio" name="log_level" value="0" [%IF log_level == 0 %]checked="checked"[%END%]/>
-            <label class="inlineLabel" for="log_level_0">0 </label>
-            <input id="log_level_1" type="radio" name="log_level" value="1" [%IF log_level == 1 %]checked="checked"[%END%]/>
-            <label class="inlineLabel" for="log_level_1">1 </label>
-            <input id="log_level_2" type="radio" name="log_level" value="2" [%IF log_level == 2 %]checked="checked"[%END%]/>
-            <label class="inlineLabel" for="log_level_2">2 </label>
-            <input id="log_level_3" type="radio" name="log_level" value="3" [%IF log_level == 3 %]checked="checked"[%END%]/>
-            <label class="inlineLabel" for="log_level_3">3 </label>
-            <input id="log_level_4" type="radio" name="log_level" value="4" [%IF log_level == 4 %]checked="checked"[%END%]/>
-            <label class="inlineLabel" for="log_level_4">4 </label>
-            <input type="submit" name="action_set_loglevel" value="[%|loc%]Set log level[%END%]" />
-        </fieldset>
-    </form>
-[% END %]
-
 [% IF subaction == 'templates' %]
     <h2>[%|loc%]Templates[%END%]</h2>
     <form class="bold_label" action="[% path_cgi %]" method="post">
@@ -288,12 +266,4 @@
     <p>[%|loc%]You can submit a problem or request a new feature: [%END%]<a href="https://github.com/sympa-community/sympa/issues/new/choose">https://github.com/sympa-community/sympa/issues/new/choose</a></p>
 [% END %]
 
-
-[% IF subaction == 'logs' %]
-    [% IF loop_count %]
-        <p class="bottom_page">
-            [%|loc(process_id,loop_count,start_time)%]This FastCGI process (%1) has served %2 pages since %3.[%END%]
-        </p>
-    [% END %]
-[% END %]
 <!-- end serveradmin.tt2 (distrib) -->
diff --git a/src/cgi/wwsympa.fcgi.in b/src/cgi/wwsympa.fcgi.in
@@ -225,7 +225,6 @@ our %comm = (
     'arc_download'      => 'do_arc_download',
     'arc_delete'        => 'do_arc_delete',
     'serveradmin'       => 'do_serveradmin',
-    'set_loglevel'      => 'do_set_loglevel',
     'set_dumpvars'      => 'do_set_dumpvars',
     'show_sessions'     => 'do_show_sessions',
     'unset_dumpvars'    => 'do_unset_dumpvars',
@@ -708,7 +707,6 @@ our %required_privileges = (
     'search_user'              => ['listmaster'],
     'serveradmin'              => ['listmaster'],
     'set_dumpvars'             => ['listmaster'],
-    'set_loglevel'             => ['listmaster'],
     'set_pending_list_request' => ['listmaster'],
     'set_session_email'        => ['listmaster'],
     'show_sessions'            => ['listmaster'],
@@ -804,7 +802,6 @@ my %action_type = (
     'show_exclude'        => 'admin',
     'rebuildarc'          => 'serveradmin',
     'set_session_email'   => 'serveradmin',
-    'set_loglevel'        => 'serveradmin',
     'editfile'            => 'serveradmin',    #FIXME: admin?
     'unset_dumpvars'      => 'serveradmin',
     'set_dumpvars'        => 'serveradmin',
@@ -1049,11 +1046,7 @@ $log->syslog('info', 'WWSympa started, process %d', $PID);
 #XXXbinmode STDIN, ":utf8";
 
 # Main loop.
-my $loop_count = 0;
-my $start_time = time;
 while ($query = Sympa::WWW::FastCGI->new) {
-    $loop_count++;
-
     undef $param;
     undef $list;
     undef $robot;
@@ -2758,12 +2751,6 @@ sub check_param_in {
 sub check_param_out {
     wwslog('debug2', '');
 
-    $param->{'loop_count'} = $loop_count;
-    $param->{'start_time'} =
-        $language->gettext_strftime("%d %b %Y at %H:%M:%S",
-        localtime $start_time);
-    $param->{'process_id'} = $PID;
-
     # listmaster has owner and editor privileges for the list.
     $param->{'is_listmaster'} =
         Sympa::is_listmaster($robot, $param->{'user'}{'email'}) ? 1 : undef;
@@ -6043,12 +6030,8 @@ sub do_edit_config {
 }
 
 ## Change log_level for the current session
-sub do_set_loglevel {
-    wwslog('info', '');
-
-    $session->{'log_level'} = $in{'log_level'};
-    return 'serveradmin';
-}
+# Deprecated.
+#sub do_set_loglevel;
 
 ## activate dump var feature
 sub do_set_dumpvars {