michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use new minecraft log file

Browse Source
This commit is contained in:
Jamie Cameron
2013-10-25 22:17:27 -07:00
parent 8c1f7f56ac
commit d22e14408a
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
minecraft/minecraft-lib.pl
View File

@@ -247,13 +247,25 @@ if (!$nolog) {
}
}
# get_minecraft_log_file()
sub get_minecraft_log_file
{
my $newfile = $config{'minecraft_dir'}."/logs/latest.log";
if (-r $newfile) {
return $newfile;
}
else {
return $config{'minecraft_dir'}."/server.log";
}
}
# execute_minecraft_command(command, [no-log], [wait-time])
# Run a command, and return output from the server log
sub execute_minecraft_command
{
my ($cmd, $nolog, $wait) = @_;
$wait ||= 100;
my $logfile = $config{'minecraft_dir'}."/server.log";
my $logfile = &get_minecraft_log_file();
my $fh = "LOG";
&open_readfile($fh, $logfile);
seek($fh, 0, 2);
@@ -310,7 +322,7 @@ sub get_login_logout_times
{
my ($name) = @_;
my ($ip, $intime, $xx, $yy, $zz, $outtime);
my $logfile = $config{'minecraft_dir'}."/server.log";
my $logfile = &get_minecraft_log_file();
my $fh = "TAIL";
my @events;
&open_execute_command($fh, "tail -10000 $logfile", 1, 1);
@@ -776,7 +788,7 @@ if (time() - $config{'last_check'} > 6*60*60) {
# usage that counts towards any limits
sub get_current_day_usage
{
my $logfile = $config{'minecraft_dir'}."/server.log";
my $logfile = &get_minecraft_log_file();
# Seek back till we find a day line from a previous day
my @st = stat($logfile);

2
minecraft/output.cgi
View File

@@ -5,7 +5,7 @@ use strict;
use warnings;
require './minecraft-lib.pl';
our (%config);
my $logfile = $config{'minecraft_dir'}."/server.log";
my $logfile = &get_minecraft_log_file();
$| = 1;
&popup_header();

2
minecraft/status_monitor.pl
View File

@@ -21,7 +21,7 @@ if ($type eq "minecraft_up") {
'desc' => $text{'monitor_down'} };
}
if ($monitor->{'checklog'}) {
my $logfile = $config{'minecraft_dir'}."/server.log";
my $logfile = &get_minecraft_log_file();
my @st = stat($logfile);
if (time() - $st[9] < 5*60) {
# Server has logged something recently, so assume OK

2
minecraft/view_logs.cgi
View File

@@ -5,7 +5,7 @@ use strict;
use warnings;
require './minecraft-lib.pl';
our (%in, %text, %config);
my $logfile = $config{'minecraft_dir'}."/server.log";
my $logfile = &get_minecraft_log_file();
&ReadParse();
$in{'lines'} = undef if ($in{'lines'} !~ /^\d+$/);