Menu
▾
▴
[Grapevine-cvs-commits] cvs: grapevine /raisen/grapevine init.xml route.xml transaction-routing.xml transaction.xml /raisen/local request.xml
|
From: blackh <gra...@li...> - 2003-08-29 12:13:06
|
blackh Fri Aug 29 05:13:03 2003 EDT
Modified files:
/grapevine/raisen/grapevine init.xml route.xml
transaction-routing.xml transaction.xml
/grapevine/raisen/local request.xml
Log:
Various improvements.
Index: grapevine/raisen/local/request.xml
diff -u grapevine/raisen/local/request.xml:1.32 grapevine/raisen/local/request.xml:1.33
--- grapevine/raisen/local/request.xml:1.32 Thu Aug 7 04:43:02 2003
+++ grapevine/raisen/local/request.xml Fri Aug 29 05:13:03 2003
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<!-- $Id: request.xml,v 1.32 2003/08/07 11:43:02 blackh Exp $ -->
+<!-- $Id: request.xml,v 1.33 2003/08/29 12:13:03 blackh Exp $ -->
<!DOCTYPE grapevine SYSTEM "../raisen.dtd" [
@@ -37,7 +37,7 @@
<grapevine>
- <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.32 $">
+ <domain name="local.request" author1="Stephen Blackheath" rev="$Revision: 1.33 $">
<rules>
main:
req=<request id="[id]" mode="process">
@@ -62,9 +62,11 @@
<obj.band id="[band]"/>,
<grapevine.init.start secs="[start]" />,
- <sys.time.now secs="[now]" />,
+ now=<sys.time.now/>#secs,
elapsed = now - start,
uptime = elapsed,
+ updays = elapsed / 86400,
+ elapsed = elapsed - (updays * 86400),
uphours = elapsed / 3600,
elapsed = elapsed - (uphours * 3600),
upminutes = elapsed / 60,
@@ -83,7 +85,7 @@
} || true,
<grapevine.local-addr.local-addr address="[myIPAddress]"/> ||
myIPAddress="<unknown>",
- !!,
+ !!, <!-- Just in case -->
assert new <html id="[id]">
<head><title>grapevine: main</title></head>
@@ -133,7 +135,7 @@
</tr>
<tr>
<td valign="top">Uptime</td>
- <td valign="top">[uphours]:[upminutes]:[upseconds] ([uptime] seconds)</td>
+ <td valign="top">[updays] days [uphours]:[upminutes]:[upseconds]</td>
</tr>
<preprocess.if test="language >= '1.1'">
<tr>
@@ -174,7 +176,6 @@
</request>,
{
fact=parseXML("local.rpc", req.text$),
- println("PROCESSING... " ## id ## " " ## fact),
remember new <local.rpc.command id="[id]">[fact]</local.rpc.command>,
req#mode = "processing-rpc",
fire new <processed id="[id]"/>
@@ -184,11 +185,6 @@
</local.rpc.reply>
};
- <!-- Diagnostic... -->
- processed:
- <processed id="[id]"/>,
- println("DONE " ## id);
-
rpc_no_match-1000:
req=<request id="[id]" mode="processing-rpc"/>,
<local.rpc.command id="[id]" mode=""/>,
@@ -203,7 +199,6 @@
retract reply,
retract <local.rpc.command id="[id]"/> || true,
replyRaw = reply(0) || replyRaw = new <error>Malformed reply</error>,
- println("REPLY " ## id ## " " ## replyRaw),
replyFact = formatXML(replyRaw),
assert new <sys.http-in.response id="[id]" code="200 OK">
<header content-type="text/xml"/>
|
