Skip to content

Fix remote logging output to correctly show snapshot being restored #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snh merged 4 commits into from
Feb 25, 2016
Merged

Fix remote logging output to correctly show snapshot being restored #170

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
540460b
Fix logging output
snh Feb 24, 2016
50f3433
Remote logging wording
snh Feb 24, 2016
5fec8c0
Use consistent logging format as ghe-backup
gnawhleinad Feb 24, 2016
8c7cbe7
Revert log message format
snh Feb 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/ghe-backup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ if ghe-ssh "$GHE_HOSTNAME" -- \
fi

# Log backup start message in /var/log/syslog on remote instance
ghe_remote_logger "Starting backup from $(hostname) in snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
ghe_remote_logger "Starting backup from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
Copy link

@michaeltwofish michaeltwofish Feb 24, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it's clearer with "in". With the slash it looks like backing up from hostname/snapshot.


# Determine whether to use the rsync or tarball backup strategy based on the
# remote appliance version. The tarball strategy must be used with GitHub
Expand Down
4 changes: 2 additions & 2 deletions bin/ghe-restore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ fi

# Log restore start message locally and in /var/log/syslog on remote instance
echo "Starting restore of $GHE_HOSTNAME from snapshot $GHE_RESTORE_SNAPSHOT"
ghe_remote_logger "Starting restore from $(hostname) / snapshot $GHE_SNAPSHOT_TIMESTAMP ..."
ghe_remote_logger "Starting restore from $(hostname) / snapshot $GHE_RESTORE_SNAPSHOT ..."

# Update remote restore state file and setup failure trap
trap "update_restore_status failed" EXIT
Expand Down Expand Up @@ -275,7 +275,7 @@ trap "" EXIT
update_restore_status "complete"

# Log restore complete message in /var/log/syslog on remote instance
ghe_remote_logger "Completed restore from $(hostname) / snapshot ${GHE_SNAPSHOT_TIMESTAMP}."
ghe_remote_logger "Completed restore from $(hostname) / snapshot $GHE_RESTORE_SNAPSHOT successfully."

if ! $cluster; then
echo "Restoring SSH host keys ..."
Expand Down