Fix merge conflict.

diff --git a/development.ini b/development.ini
index eff362fddba50331059114eb1f31bc236118834c..62c9c36fac5507f879d0db47d84cec140f4e5af9 100755 (executable)
--- a/development.ini
+++ b/development.ini
@@ -36,20 +36,6 @@ xonstat.leaderboard_lifetime = 30
 # Note: the default is true
 xonstat.verify_requests = false
 
-# similar to the above variables, but for server-specific views
-
-# how far back to go when fetching server statistics
-xonstat.servers.leaderboard_lifetime = 30
-
-# how many entries on the leaderboard to show
-xonstat.servers.leaderboard_count = 10
-
-# how many server entries to show per page
-xonstat.servers.index_count = 20
-
-# how many recent games to show
-xonstat.servers.recent_games_count = 20
-
 ##### END XONSTAT CONFIG SETTINGS #####
 
 [pipeline:main]

diff --git a/production.ini b/production.ini
index c3838a1107aff3f1b3af8057cec31443c37a4c91..a2da1cf785a9cb3b371955d2f5d1aa8418a7bdf8 100644 (file)
--- a/production.ini
+++ b/production.ini
@@ -19,10 +19,6 @@ cache.hourly_term.expire  =  3600
 xonstat.minimum_required_players     = 2
 xonstat.leaderboard_lifetime         = 7
 xonstat.verify_requests              = true
-xonstat.servers.leaderboard_lifetime = 30
-xonstat.servers.leaderboard_count    = 10
-xonstat.servers.index_count          = 20
-xonstat.servers.recent_games_count   = 20
 
 [filter:weberror]
 use   = egg:WebError#error_catcher

diff --git a/xonstat/views/server.py b/xonstat/views/server.py
index c443bafc716b69d54800e28eb67ed843c50c1ea3..a3e4bf47fdcfee13cd8b55b44480f78b20cc6d28 100644 (file)
--- a/xonstat/views/server.py
+++ b/xonstat/views/server.py
@@ -4,7 +4,6 @@ import sqlalchemy.sql.expression as expr
 from collections import namedtuple
 from datetime import datetime, timedelta
 from pyramid.httpexceptions import HTTPNotFound
-from pyramid.registry import Registry
 from sqlalchemy import func as fg
 from webhelpers.paginate import Page
 from xonstat.models import DBSession, Player, Server, Map, Game, PlayerGameStat
@@ -15,11 +14,10 @@ log = logging.getLogger(__name__)
 
 
 # Defaults
-settings = Registry.settings
-LEADERBOARD_LIFETIME = int(settings.get("xonstat.servers.leaderboard_lifetime", 30))
-LEADERBOARD_COUNT = int(settings.get("xonstat.servers.leaderboard_count", 10))
-INDEX_COUNT = int(settings.get("xonstat.servers.index_count", 20))
-RECENT_GAMES_COUNT = int(settings.get("xonstat.servers.recent_games_count", 20))
+LEADERBOARD_LIFETIME = 30
+LEADERBOARD_COUNT = 10
+INDEX_COUNT = 20
+RECENT_GAMES_COUNT = 20
 
 
 class ServerIndex(object):

diff --git a/xonstat/views/submission.py b/xonstat/views/submission.py
index 908bf8667a9c45416dc299098407706b7a6623c0..1b6e5fe0ad80462fb1f306ec1e4ee7fffdb069c5 100644 (file)
--- a/xonstat/views/submission.py
+++ b/xonstat/views/submission.py
@@ -1111,8 +1111,7 @@ def submit_stats(request):
             pgstats.append(pgstat)
 
             # player ranking opt-out
-            if 'r' in events and events['r'] != "0":
-                log.debug("excluding player {} from Elo calculations".format(events['i']))
+            if 'r' in events and events['r'] != '0':
                 elo_pgstats.append(pgstat)
 
             if player.player_id > 1: