HCoop
/
hcoop
/
domtool2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Less noisy pinging and shutting down
[hcoop/domtool2.git]
/
src
/
domain.sml
diff --git
a/src/domain.sml
b/src/domain.sml
index
8384f85
..
d1046b7
100644
(file)
--- a/
src/domain.sml
+++ b/
src/domain.sml
@@
-113,11
+113,11
@@
fun validIpv6 s =
fun isIdent ch = Char.isLower ch orelse Char.isDigit ch
fun validHost s =
fun isIdent ch = Char.isLower ch orelse Char.isDigit ch
fun validHost s =
- size s > 0 andalso size s <
2
0
+ size s > 0 andalso size s <
5
0
andalso CharVector.all (fn ch => isIdent ch orelse ch = #"-") s
fun validDomain s =
andalso CharVector.all (fn ch => isIdent ch orelse ch = #"-") s
fun validDomain s =
- size s > 0 andalso size s <
1
00
+ size s > 0 andalso size s <
2
00
andalso List.all validHost (String.fields (fn ch => ch = #".") s)
fun validNode s = List.exists (fn s' => s = s') nodes
andalso List.all validHost (String.fields (fn ch => ch = #".") s)
fun validNode s = List.exists (fn s' => s = s') nodes
@@
-645,7
+645,10
@@
val _ = Env.containerV_one "domain"
write "\t};\n")
| _ => (write "\tmasters { ";
write masterIp;
write "\t};\n")
| _ => (write "\tmasters { ";
write masterIp;
- write "; };\n");
+ write "; };\n";
+ write "// Updated: ";
+ write (Time.toString (Time.now ()));
+ write "\n");
write "};\n";
close ()
end
write "};\n";
close ()
end
@@
-696,10
+699,10
@@
fun handleSite (site, files) =
if site = Config.defaultNode then
Slave.handleChanges files
else let
if site = Config.defaultNode then
Slave.handleChanges files
else let
- val bio = OpenSSL.connect (valOf (!ssl_context),
- nodeIp site
- ^ ":"
- ^ Int.toString Config.slavePort)
+ val bio = OpenSSL.connect
true
(valOf (!ssl_context),
+
nodeIp site
+
^ ":"
+
^ Int.toString Config.slavePort)
in
app (fn file => Msg.send (bio, MsgFile file)) files;
Msg.send (bio, MsgDoFiles);
in
app (fn file => Msg.send (bio, MsgFile file)) files;
Msg.send (bio, MsgDoFiles);