Skip to content

Some logging fixes #229

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

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Some logging fixes #229

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd261fe
Fixed issue that minecraft's recreates the log file on server start,
mboogerd Nov 29, 2013
9f6ab3d
Added additional regex to identify log entries in the new 1.7 format
mboogerd Nov 29, 2013
2896c19
Fixed log_line_get_time: It now verifies the format of the log line
mboogerd Nov 29, 2013
d3583cc
Fixed server_log_dots_for_lines and server_log_get_line:
mboogerd Nov 29, 2013
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
33 changes: 25 additions & 8 deletions init/msm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ follow_links "$COMPLETION"; COMPLETION="$RETURN"
# The start of a regex to find a log line
LOG_REGEX="^[0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2} \[.*\]"

# Minecraft 1.7 logging regex
LOG_REGEX_1_7="^\[[0-9]{2}:[0-9]{2}:[0-9]{2}\] \[.*\]:"

# Lazy allocation status
ALLOCATED_SERVERS="false"
ALLOCATED_WORLDS="false"
Expand Down Expand Up @@ -295,7 +298,16 @@ now() {
# $1: A server log line
# returns: Time in seconds since 1970-01-01 00:00:00 UTC
log_line_get_time() {
time_string="$(echo "$1" | awk '{print $1 " " $2}')"
# Verify that the log line matches the pre 1.7 timestamp pattern
if [[ $1 =~ $LOG_REGEX ]]; then
time_string="$(echo "$1" | awk '{print $1 " " $2}')"
elif [[ $1 =~ $LOG_REGEX_1_7 ]]; then
# New 1.7 logging! Notice that we do _not_ have a date so the timestamp will be resolved against todays date, which might lead to undesirable results!
time_string="$(echo "$1" | awk -F'[][]' '{print $2}')"
# TODO: Test rigorously!
# Test case 1: Command whose execution time crosses midnight
# Test case 2: Servers infrequently writing to logs over the course of days
fi
date -d "$time_string" "+%s" 2> /dev/null
}

Expand Down Expand Up @@ -801,6 +813,7 @@ server_log_get_line() {
as_user "${SERVER_USERNAME[$1]}" "touch ${SERVER_LOG_PATH[$1]}"

local regex="${LOG_REGEX} ($3)"
local regex1_7="${LOG_REGEX_1_7} ($3)"
local timeout_deadline=$(( $(now) + $4 ))

# Read log, break if nothing is read in $4 seconds
Expand All @@ -811,12 +824,15 @@ server_log_get_line() {
[[ "$(now)" -gt "$timeout_deadline" ]] && break

# If the entry is old enough
if [[ "$line_time" -ge "$2" ]] && [[ "$line" =~ $regex ]]; then
# Return the line
RETURN="${BASH_REMATCH[1]}"
return 0
if [[ "$line_time" -ge "$2" ]]; then
# And the entry matches the log pattern
if [[ "$line" =~ $regex ]] || [[ "$line" =~ $regex1_7 ]]; then
# Return the line
RETURN="${BASH_REMATCH[1]}"
return 0
fi
fi
done < <(as_user "${SERVER_USERNAME[$1]}" "tail --pid=$$ --follow --lines=20 --sleep-interval=0.1 \"${SERVER_LOG_PATH[$1]}\"")
done < <(as_user "${SERVER_USERNAME[$1]}" "tail --pid=$$ -F --lines=20 --sleep-interval=0.1 \"${SERVER_LOG_PATH[$1]}\" 2>/dev/null")
}

# The same as server_log_get_line, but prints a dot instead of the log line
Expand All @@ -834,6 +850,7 @@ server_log_dots_for_lines() {
as_user "${SERVER_USERNAME[$1]}" "touch ${SERVER_LOG_PATH[$1]}"

local regex="${LOG_REGEX} ($3)"
local regex1_7="${LOG_REGEX_1_7} ($3)"
local timeout_deadline=$(( $(now) + $4 ))

# Read log, break if nothing is read in $4 seconds
Expand All @@ -850,11 +867,11 @@ server_log_dots_for_lines() {
echo -n '.'

# and if it matches the regular expression, return
if [[ "$line" =~ $regex ]]; then
if [[ "$line" =~ $regex ]] || [[ "$line" =~ $regex1_7 ]]; then
return 0
fi
fi
done < <(as_user "${SERVER_USERNAME[$1]}" "tail --pid=$$ --follow --lines=100 --sleep-interval=0.1 \"${SERVER_LOG_PATH[$1]}\"")
done < <(as_user "${SERVER_USERNAME[$1]}" "tail --pid=$$ -F --lines=100 --sleep-interval=0.1 \"${SERVER_LOG_PATH[$1]}\" 2>/dev/null")
}

# Sends as string to a server for execution
Expand Down