[interchange-cvs] interchange - heins modified 2 files

interchange-core@icdevgroup.org interchange-core@icdevgroup.org
Sun Oct 27 20:59:00 2002


User:      heins
Date:      2002-10-28 01:58:35 GMT
Modified:  code/UI_Tag reconfig_wait.coretag
Modified:  dist/lib/UI/pages/admin reconfig.html
Log:
* Reconfig seems to be always timing out on faster processors, made more
  reliable....

Revision  Changes    Path
1.2       +30 -12    interchange/code/UI_Tag/reconfig_wait.coretag


rev 1.2, prev_rev 1.1
Index: reconfig_wait.coretag
===================================================================
RCS file: /var/cvs/interchange/code/UI_Tag/reconfig_wait.coretag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- reconfig_wait.coretag	29 Jan 2002 05:52:40 -0000	1.1
+++ reconfig_wait.coretag	28 Oct 2002 01:58:35 -0000	1.2
@@ -1,21 +1,39 @@
 UserTag reconfig-wait Order name
+UserTag reconfig-wait Version $Revision: 1.2 $
 UserTag reconfig-wait Routine <<EOR
 sub {
 	my $name = shift || $Vend::Cfg->{CatalogName};
 	my $myname = $Vend::Cfg->{CatalogName};
 	return '' unless $myname eq '_mv_admin' or $myname eq $name;
-    my $now = time();
-    my $mod = ( stat("$Global::RunDir/status." . $Vend::Cfg->{CatalogName}))[9];
-    if( ($now - $mod) < $Global::HouseKeeping ) {
-        $::Scratch->{possible_timeout} = 0;
-        $::Scratch->{reconfigured} = 1;
-        return '';
-    }
-    else {
-        sleep 1;
-        $::Scratch->{possible_timeout} = 1;
-        return errmsg('please wait') . '...<BR>';
-    }
+    my $now = time() - 2;
+    my $mod;
+	if($Global::HouseKeeping > 5) {
+		my $link = Vend::Tags->page({
+				href => "$::Variable->{UI_BASE}/genconfig",
+				form => "start_at_index=1",
+				});
+		return qq{
+HouseKeeping value of $Global::HouseKeeping seconds too long to wait. Check
+$link last time changes applied </A> to ensure the reconfig worked.};
+	}
+
+	my $msg = errmsg('please wait');
+	$msg .= '...';
+	$msg .= ' ' x 8192;
+	$msg .= "<br>\n";
+	for( 1 .. ($Global::HouseKeeping + 3) ) {
+		$mod = ( stat("$Global::RunDir/status." . $Vend::Cfg->{CatalogName}))[9];
+		if($mod > $now) {
+			$::Scratch->{possible_timeout} = 0;
+			$::Scratch->{reconfigured} = 1;
+			return;
+		}
+		else {
+			::response($msg);
+			$::Scratch->{possible_timeout} = 1;
+			sleep 1;
+		}
+	}
 }
 EOR
 



2.4       +5 -6      interchange/dist/lib/UI/pages/admin/reconfig.html


rev 2.4, prev_rev 2.3
Index: reconfig.html
===================================================================
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/reconfig.html,v
retrieving revision 2.3
retrieving revision 2.4
diff -u -r2.3 -r2.4
--- reconfig.html	1 May 2002 21:55:34 -0000	2.3
+++ reconfig.html	28 Oct 2002 01:58:35 -0000	2.4
@@ -14,17 +14,16 @@
 [set icon_name]icon_regen.gif[/set]
 @_UI_STD_HEAD_@
 
-[L]Reconfiguring catalog[/L]: ...<BR>[seti reconfig_status][reconfigure][/seti]
+[L]Reconfiguring catalog[/L]: ...<BR>
+[tmp name=RECONFIG_STATUS send=1][reconfigure][/tmp]
 
-[loop arg="[scratch its]"]
-[reconfig-wait send=1]
-[/loop]
+[reconfig-wait]
 
 [if scratch possible_timeout]
  [L]WARNING: Reconfiguration may have timed out[/L].<BR>
 [L]Last config[/L]: [reconfig-time]
 [else]
-[L]SUCCESS[/L]
+[L]SUCCESS[/L], config time [file name=`"etc/status.$Config->{CatalogName}"`]
 [value name=ui_changes_made set=""]
 [/else]
 [/if]
@@ -34,4 +33,4 @@
 <!-- ----- END REAL STUFF ----- -->
 
 @_UI_STD_FOOTER_@
-<!-- page: @@MV_PAGE@@ -->
+<!-- page: @@MV_PAGE@@ version: $Revision: 2.4 $ -->