OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Thomas Lotterer
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-registry Date: 23-Feb-2006 13:01:55
Branch: HEAD Handle: 2006022312015500
Modified files:
openpkg-registry registry-db.pl registry-ui.pl
Log:
document in schema that reregistration is part of the game; make
descriptive text more user friendly; properly log every
reregistration; increase currently fixed interval of reregistration to
150 days (useless today because FTP server does not verify interval
but expect this to happen some time)
Summary:
Revision Changes Path
1.17 +1 -1 openpkg-registry/registry-db.pl
1.53 +8 -6 openpkg-registry/registry-ui.pl
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-registry/registry-db.pl
============================================================================
$ cvs diff -u -r1.16 -r1.17 registry-db.pl
--- openpkg-registry/registry-db.pl 23 Feb 2006 11:26:33 -0000 1.16
+++ openpkg-registry/registry-db.pl 23 Feb 2006 12:01:55 -0000 1.17
@@ -514,7 +514,7 @@
registry_date TIMESTAMP (0) WITHOUT TIME ZONE
NOT NULL
DEFAULT CURRENT_TIMESTAMP,
- -- time of registration
+ -- time of registration or last reregistration
-- [2005-11-08 00:00:00]
associated BOOLEAN
NOT NULL
@@ .
patch -p0 <<'@@ .'
Index: openpkg-registry/registry-ui.pl
============================================================================
$ cvs diff -u -r1.52 -r1.53 registry-ui.pl
--- openpkg-registry/registry-ui.pl 23 Feb 2006 11:26:33 -0000 1.52
+++ openpkg-registry/registry-ui.pl 23 Feb 2006 12:01:55 -0000 1.53
@@ -1297,15 +1297,15 @@
if ($mode eq "arrival") {
$where = "associated = 'false'";
- $headline = "Arrival - queue of registered instances waiting for
association";
+ $headline = "Arrival - queue of registered instances waiting for
association or deletion";
}
elsif ($mode eq "active") {
- $where = "associated = 'true' AND registry_date >= (now() - interval
'2 days')";
- $headline = "Active - associated instances";
+ $where = "associated = 'true' AND registry_date >= (now() - interval
'150 days')";
+ $headline = "Active - associated instances eligible to use
additional services e.g. FTP download";
}
elsif ($mode eq "departure") {
- $where = "associated = 'true' AND registry_date < (now() - interval
'2 days')";
- $headline = "Departure - associated instances without heartbeat";
+ $where = "associated = 'true' AND registry_date < (now() - interval
'150 days')";
+ $headline = "Departure - queue of former active instances without
recent re-registration";
}
else {
die;
@@ -1389,7 +1389,7 @@
$html .= $cgi->submit("$mode/modify",'modify and associate')
}
else {
- $html .= $cgi->submit("$mode/modify",'modify and refresh')
+ $html .= $cgi->submit("$mode/modify",'modify and reload')
}
$html .= "</td>";
$html .= "</tr>\n";
@@ -1549,6 +1549,8 @@
my $rowkey;
$rowkey = undef;
($sql, $fields, $fieldlist, $fieldbind, $fieldvals, $sth) =
undef;
+ $fieldlist = 'registry_date = ?';
+ push @{$fieldvals}, 'now()'; #FIXME this should read DEFAULT or
COLUMN_DEF but does not work here for unknown reasons
for my $field (sort keys %{$ref->{request}->{$k}}) {
if ($field eq "uuid_registry") {
$rowkey = $ref->{request}->{$k}->{$field}
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [email protected]
