diff --git a/Anvil/Tools/Database.pm b/Anvil/Tools/Database.pm
index ca529f15..2467c7b4 100644
--- a/Anvil/Tools/Database.pm
+++ b/Anvil/Tools/Database.pm
@@ -1625,7 +1625,7 @@ sub connect
# Read the DB identifier and then check that we've not already connected to this DB.
my $query = "SELECT system_identifier FROM pg_control_system();";
- my $identifier = $anvil->Database->query({uuid => $uuid, query => $query, source => $THIS_FILE, line => __LINE__})->[0]->[0];
+ my $identifier = $anvil->Database->query({debug => $debug, uuid => $uuid, query => $query, source => $THIS_FILE, line => __LINE__})->[0]->[0];
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => {
query => $query,
identifier => $identifier,
@@ -1691,7 +1691,7 @@ sub connect
variable_name => "database::".$uuid."::active",
});
$anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => $debug, list => { active_value => $active_value }});
- if (not $active_value)
+ if ($active_value eq "0")
{
# If we're "retry", we just started up.
if (($retry) && ($is_local))
diff --git a/share/words.xml b/share/words.xml
index 2584c794..abef2821 100644
--- a/share/words.xml
+++ b/share/words.xml
@@ -466,7 +466,7 @@ Giving up.
Failed to find the server: [#!variable!server!#] by name or UUID? Exiting.
The protocol: [#!variable!protocol!#] is invalid. Please use '--help' for more information.
The DR host: [#!variable!host_name!#] doesn't appear to be storage group: [#!variable!storage_group!#]. Unable to proceed.
- We need: [#!variable!space_needed!# (#!variables!space_needed_bytes!# Bytes)] from the storage group: [#!variable!storage_group!#], but only: [#!variables!space_on_dr!# (#!variable!space_on_dr_bytes!# bytes)] is available on DR. Unable to proceed.
+ We need: [#!variable!space_needed!# (#!variable!space_needed_bytes!# Bytes)] from the storage group: [#!variable!storage_group!#], but only: [#!variable!space_on_dr!# (#!variable!space_on_dr_bytes!# bytes)] is available on DR. Unable to proceed.
[ Error ] - The check appears to have failed. Expected a return code of '0', but got: [#!variable!return_code!#]
The output, if any, was
====
@@ -520,7 +520,7 @@ The definition data passed in was:
====
]]>
[ Error ] - Failed to wipe and delete the logical volume: [#!variable!local_lv!#] that was volume number: [#!variable!volume!#] under the server: [#!variable!server!#].
- There was a problem deleting: [#!variables!config_file!#]. The rest of the process completed successfully. Please manually remove this file if it still exists.
+ There was a problem deleting: [#!variable!config_file!#]. The rest of the process completed successfully. Please manually remove this file if it still exists.
@@ -2197,7 +2197,7 @@ The file: [#!variable!file!#] needs to be updated. The difference is:
The server: [#!variable!server!#] is ready to boot.
The server: [#!variable!server!#] was found to be running already, but it wasn't marked as booted. Marking it as if it just booted to handle any dependent servers.
The server: [#!variable!server!#] is configured to stay off, ignoring it.
- The file: [#!variable!file!#] needs to be added to the database, but since the last scan it's size grew from: [#!variable!old_size_bytes!# (#!variables!old_size_hr!#)] to: [#!variable!new_size_bytes!# (#!variables!new_size_hr!#)]. A difference of: [#!variable!difference_bytes!# (#!variables!difference_hr!#)]. It might still be being uploaded, so we'll keep checking periodocally until the size stops changing.
+ The file: [#!variable!file!#] needs to be added to the database, but since the last scan it's size grew from: [#!variable!old_size_bytes!# (#!variable!old_size_hr!#)] to: [#!variable!new_size_bytes!# (#!variable!new_size_hr!#)]. A difference of: [#!variable!difference_bytes!# (#!variable!difference_hr!#)]. It might still be being uploaded, so we'll keep checking periodocally until the size stops changing.
Found the missing file: [#!variable!file!#] in the directory: [#!variable!directory!#]. Updating the database now.
diff --git a/tools/anvil-manage-files b/tools/anvil-manage-files
index d07cb7be..76f2b6ee 100755
--- a/tools/anvil-manage-files
+++ b/tools/anvil-manage-files
@@ -28,7 +28,8 @@
# 6 = The file to delete is not under '/mnt/shared/'.
#
# TODO:
-# -
+# - If two Strikers have the same file name, but different sizes, we get into a yo-yo of updating the two
+# sides. If this happens, we need to rsync the larger one over the smaller one.
#
# NOTE:
# - remove unsyncs, add syncs.