[LON-CAPA-cvs] cvs: loncom / loncron
raeburn
raeburn at source.lon-capa.org
Sun Mar 17 20:37:37 EDT 2019
raeburn Mon Mar 18 00:37:37 2019 EDT
Modified files:
/loncom loncron
Log:
- loncron --justiptables will update dynamic iptables rules for lond port,
and nothing else (e.g., run this after restarting iptables).
Index: loncom/loncron
diff -u loncom/loncron:1.117 loncom/loncron:1.118
--- loncom/loncron:1.117 Sun Mar 17 23:23:21 2019
+++ loncom/loncron Mon Mar 18 00:37:37 2019
@@ -2,7 +2,7 @@
# Housekeeping program, started by cron, loncontrol and loncron.pl
#
-# $Id: loncron,v 1.117 2019/03/17 23:23:21 raeburn Exp $
+# $Id: loncron,v 1.118 2019/03/18 00:37:37 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1486,19 +1486,23 @@
do not send emails do not
check if the daemons are running, do not
generate lon-status
-
+ --justiptables Only update the dynamic iptables rules for the
+ lond port; do not send emails, do not
+ check if the daemons are running, do not
+ generate lon-status
USAGE
}
# ================================================================ Main Program
sub main () {
my ($help,$justcheckdaemons,$noemail,$justcheckconnections,
- $justreload);
+ $justreload,$justiptables);
&GetOptions("help" => \$help,
"justcheckdaemons" => \$justcheckdaemons,
"noemail" => \$noemail,
"justcheckconnections" => \$justcheckconnections,
- "justreload" => \$justreload
+ "justreload" => \$justreload,
+ "justiptables" => \$justiptables
);
if ($help) { &usage(); return; }
# --------------------------------- Read loncapa_apache.conf and loncapa.conf
@@ -1548,9 +1552,11 @@
}
}
}
- &Apache::lonnet::load_hosts_tab(1,$nomemcache);
- &Apache::lonnet::load_domain_tab(1,$nomemcache);
- &Apache::lonnet::get_iphost(1,$nomemcache);
+ if (!$justiptables) {
+ &Apache::lonnet::load_hosts_tab(1,$nomemcache);
+ &Apache::lonnet::load_domain_tab(1,$nomemcache);
+ &Apache::lonnet::get_iphost(1,$nomemcache);
+ }
# ----------------------------------------- Force firewall update for lond port
@@ -1581,7 +1587,7 @@
my $fh;
- if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {
+ if (!$justcheckdaemons && !$justcheckconnections && !$justreload && !$justiptables) {
$fh=&start_logging();
&log_machine_info($fh);
@@ -1593,7 +1599,7 @@
&rotate_lonnet_logs($fh);
&rotate_other_logs($fh);
}
- if (!$justcheckconnections && !$justreload) {
+ if (!$justcheckconnections && !$justreload && !$justiptables) {
&checkon_daemon($fh,'lonmemcached',40000);
&checkon_daemon($fh,'lonsql',200000);
if ( &checkon_daemon($fh,'lond',40000,'USR1') eq 'running') {
@@ -1614,7 +1620,7 @@
if ($justcheckconnections) {
&test_connections($fh);
}
- if (!$justcheckdaemons && !$justcheckconnections && !$justreload) {
+ if (!$justcheckdaemons && !$justcheckconnections && !$justreload && !$justiptables) {
my $domconf = &get_domain_config();
my ($threshold,$sysmail,$reportstatus,$weightsref,$exclusionsref) =
&get_permcount_settings($domconf);
More information about the LON-CAPA-cvs
mailing list