diff options
| author | proller <proller@github.com> | 2013-10-18 21:56:34 +0400 |
|---|---|---|
| committer | proller <proller@github.com> | 2013-10-18 23:57:22 +0400 |
| commit | 382357d61cde9d6d1b3cb94053ab1127db9d5462 (patch) | |
| tree | 10e9a43971402e8c88e031177592771a943b86c0 /util/master/master.cgi | |
| parent | a924409bd1c57fb96e67a1c6cea0b7331d11cb73 (diff) | |
| download | minetest-382357d61cde9d6d1b3cb94053ab1127db9d5462.tar.gz minetest-382357d61cde9d6d1b3cb94053ab1127db9d5462.tar.bz2 minetest-382357d61cde9d6d1b3cb94053ab1127db9d5462.zip | |
Masterserver totals fix
Diffstat (limited to 'util/master/master.cgi')
| -rwxr-xr-x | util/master/master.cgi | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/util/master/master.cgi b/util/master/master.cgi index a916827fe..6dbf83fca 100755 --- a/util/master/master.cgi +++ b/util/master/master.cgi @@ -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; |