Skip to content

Commit 392d223

Browse files
authored
Merge pull request #1074 from FAForever/refactor/veto-logs
removed _____ from veto debug logs
2 parents 1e203cd + a94abc1 commit 392d223

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

server/ladder_service/ladder_service.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -574,20 +574,20 @@ def get_displayed_rating(player: Player) -> float:
574574
raise RuntimeError(f"No map pool available for rating {rating}!")
575575

576576
self._logger.debug(
577-
"______queue.map_pools[map_pool.id]________________: %s",
577+
"queue.map_pools[map_pool.id]: %s",
578578
queue.map_pools[map_pool.id],
579579
)
580580
initial_weights = self.veto_service.generate_initial_weights_for_match(
581581
all_players,
582582
queue.map_pools[map_pool.id],
583583
)
584584
self._logger.debug(
585-
"______initial_weights________________: %s",
585+
"initial_weights: %s",
586586
initial_weights,
587587
)
588588
game_map = map_pool.choose_map(played_map_ids, initial_weights)
589589

590-
self._logger.debug("______game_map________________: %s", game_map)
590+
self._logger.debug("game_map: %s", game_map)
591591

592592
game = self.game_service.create_game(
593593
game_class=LadderGame,

server/ladder_service/veto_system.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ def generate_initial_weights_for_match(
187187
bracket_vetoes = player.vetoes.get_vetoes_for_bracket(pool_id)
188188
vetoes_map[m.map_pool_map_version_id] += bracket_vetoes.get(m.map_pool_map_version_id, 0)
189189

190-
self._logger.debug("______vetoes_map________________: %s", vetoes_map)
190+
self._logger.debug("vetoes_map: %s", vetoes_map)
191191

192192
if max_tokens_per_map == 0:
193193
max_tokens_per_map = self.calculate_dynamic_tokens_per_map(minimum_maps_after_veto, vetoes_map.values())

server/matchmaker/map_pool.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,13 +85,13 @@ def choose_map(self, played_map_ids: Iterable[int] = (), initial_weights: Option
8585
self._logger.critical("Trying to choose a map from an empty map pool: %s", self.name)
8686
raise RuntimeError(f"Map pool {self.name} not set!")
8787

88-
self._logger.debug("______initial_played_map_ids___________: %s", list(played_map_ids))
88+
self._logger.debug("initial_played_map_ids: %s", list(played_map_ids))
8989
played_map_pool_map_version_ids = [
9090
self.maps[id].map_pool_map_version_id
9191
for id in played_map_ids
9292
if id in self.maps
9393
]
94-
self._logger.debug("______played_map_pool_map_version_ids_________: %s", played_map_pool_map_version_ids)
94+
self._logger.debug("played_map_pool_map_version_ids: %s", played_map_pool_map_version_ids)
9595

9696
map_list = [(m.map_pool_map_version_id, m) for m in self.maps.values()]
9797

@@ -101,10 +101,10 @@ def choose_map(self, played_map_ids: Iterable[int] = (), initial_weights: Option
101101
adjusted_weights = self.apply_antirepetition_adjustment(
102102
initial_weights, played_map_pool_map_version_ids, config.LADDER_ANTI_REPETITION_WEIGHT_BASE_THRESHOLDS, config.LADDER_ANTI_REPETITION_REPEAT_COUNTS_FACTOR
103103
)
104-
self._logger.debug("______adjusted_weights________________: %s", adjusted_weights)
105-
self._logger.debug("______map_list________________: %s", map_list)
104+
self._logger.debug("adjusted_weights: %s", adjusted_weights)
105+
self._logger.debug("map_list: %s", map_list)
106106
final_weights = [adjusted_weights.get(mp_mv_id, 0) * m.weight for mp_mv_id, m in map_list]
107-
self._logger.debug("______final_weights________________: %s", final_weights)
107+
self._logger.debug("final_weights: %s", final_weights)
108108
return random.choices([map for _, map in map_list], weights=final_weights, k=1)[0].get_map() # nosec B311
109109

110110
def __repr__(self) -> str:

0 commit comments

Comments
 (0)