moparisthebest/minetest
1
0
Fork 0
mirror of https://github.com/moparisthebest/minetest synced 2024-11-04 16:35:03 -05:00
Code Issues Releases Wiki Activity

Masterserver totals fix

Browse Source
This commit is contained in:
proller 2013-10-18 21:56:34 +04:00
parent a924409bd1
commit 382357d61c
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
util/master/list.js
View File

@ -48,10 +48,8 @@ function human_time(t, abs) {
function success(r) {
if (!r || !r.list) return;
var h = '';
if (!master.no_total && r.total)
h += '<div class="mts_total">Now players: ' + r.total.clients + ' servers: ' + r.total.servers + '</div>';
if (!master.no_total_max && r.total_max)
h += '<div class="mts_total_max">Max players: ' + r.total_max.clients + ' servers: ' + r.total_max.servers + '</div>';
if (!master.no_total && r.total && r.total_max)
h += '<div class="mts_total">Players: ' + r.total.clients + ('/' + r.total_max.clients) + ' servers: ' + r.total.servers + ('/' + r.total_max.servers) + '</div>';
h += '<table class="mts_table">';
if (r.list.length) {
h += '<tr class="mts_head">';

15
util/master/master.cgi
View File

@ -229,7 +229,7 @@ sub request (;$) {
return if !$param->{ping};
}
my $list = read_json($config{list_full}) || {};
printlog "readed[$config{list_full}] list size=", scalar @{$list->{list}};
printlog "readed[$config{list_full}] list size=", scalar @{$list->{list}} if $config{debug};
my $listk = {map { $_->{key} => $_ } @{$list->{list}}};
my $old = $listk->{$param->{key}};
$param->{time} = $old->{time} if $param->{off};
@ -250,13 +250,12 @@ sub request (;$) {
delete $param->{action};
$listk->{$param->{key}} = $param;
#printlog 'write', Dumper $param if $config{debug};
$list->{list} = [grep { $_->{time} > time - $config{time_purge} } values %$listk];
file_rewrite($config{list_full}, JSON->new->encode($list));
printlog "writed[$config{list_full}] list size=", scalar @{$list->{list}} if $config{debug};
my $list_full = [grep { $_->{time} > time - $config{time_purge} } values %$listk];
$list->{list} = [
sort { $b->{clients} <=> $a->{clients} || $a->{start} <=> $b->{start} }
grep { $_->{time} > time - $config{time_alive} and !$_->{off} and (!$config{ping} or !$config{pingable} or $_->{ping}) }
@{$list->{list}}
@{$list_full}
];
$list->{total} = {clients => 0, servers => 0};
for (@{$list->{list}}) {
@ -265,8 +264,14 @@ sub request (;$) {
}
$list->{total_max}{clients} = $list->{total}{clients} if $list->{total_max}{clients} < $list->{total}{clients};
$list->{total_max}{servers} = $list->{total}{servers} if $list->{total_max}{servers} < $list->{total}{servers};
file_rewrite($config{list_pub}, JSON->new->encode($list));
printlog "writed[$config{list_pub}] list size=", scalar @{$list->{list}} if $config{debug};
$list->{list} = $list_full;
file_rewrite($config{list_full}, JSON->new->encode($list));
printlog "writed[$config{list_full}] list size=", scalar @{$list->{list}} if $config{debug};
}
};
return [200, ["Content-type", "application/json"], [JSON->new->encode({})]], $after;