Skip to content

Commit

Permalink
make metrics methods agree in tense
Browse files Browse the repository at this point in the history
  • Loading branch information
ajanata committed Feb 24, 2017
1 parent 45690c1 commit a0d21cd
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion src/main/java/net/socialgamer/cah/StartupUtils.java
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public void contextInitialized(final ServletContextEvent contextEvent) {
CardcastService.hackSslVerifier();

// log that the server (re-)started to metrics logging (to flush all old games and users)
injector.getInstance(Metrics.class).serverStarted(
injector.getInstance(Metrics.class).serverStart(
injector.getInstance(Key.get(String.class, UniqueId.class)));
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/net/socialgamer/cah/data/Game.java
Original file line number Diff line number Diff line change
Expand Up @@ -1512,7 +1512,7 @@ public void process() {
rescheduleTimer(task, ROUND_INTERMISSION);
}

metrics.roundJudged(currentUniqueId, user.getSessionId(), cardPlayer.getUser().getSessionId(),
metrics.roundComplete(currentUniqueId, user.getSessionId(), cardPlayer.getUser().getSessionId(),
playedCards.cardsByUser());

return null;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/socialgamer/cah/metrics/KafkaMetrics.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class KafkaMetrics implements Metrics {
private static final Logger LOG = Logger.getLogger(KafkaMetrics.class);

@Override
public void serverStarted(final String startupId) {
public void serverStart(final String startupId) {
LOG.trace(String.format("serverStarted(%s)", startupId));
}

Expand All @@ -73,7 +73,7 @@ public void gameStart(final String gameId, final Collection<CardSet> decks, fina
}

@Override
public void roundJudged(final String gameId, final String judgeSessionId,
public void roundComplete(final String gameId, final String judgeSessionId,
final String winnerSessionId,
final Map<User, List<WhiteCard>> cards) {
LOG.trace(String.format("roundJudged(%s, %s, %s, %s)", gameId, judgeSessionId, winnerSessionId,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/socialgamer/cah/metrics/Metrics.java
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
* @author Andy Janata ([email protected])
*/
public interface Metrics {
void serverStarted(String startupId);
void serverStart(String startupId);

void newUser(String persistentId, String sessionId, @Nullable CityResponse geoIp,
String agentName, String agentType, String agentOs, String agentLanguage);
Expand All @@ -51,7 +51,7 @@ void newUser(String persistentId, String sessionId, @Nullable CityResponse geoIp

// The card data is way too complicated to dictate the format it should be in, so let
// implementations deal with the structured data.
void roundJudged(String gameId, String judgeSessionId, String winnerSessionId,
void roundComplete(String gameId, String judgeSessionId, String winnerSessionId,
Map<User, List<WhiteCard>> cards);

void gameStart(String gameId, Collection<CardSet> decks, int blanks, int maxPlayers,
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/net/socialgamer/cah/metrics/NoOpMetrics.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public class NoOpMetrics implements Metrics {
private static final Logger LOG = Logger.getLogger(NoOpMetrics.class);

@Override
public void serverStarted(final String startupId) {
public void serverStart(final String startupId) {
LOG.trace(String.format("serverStarted(%s)", startupId));
}

Expand All @@ -73,7 +73,7 @@ public void gameStart(final String gameId, final Collection<CardSet> decks, fina
}

@Override
public void roundJudged(final String gameId, final String judgeSessionId,
public void roundComplete(final String gameId, final String judgeSessionId,
final String winnerSessionId,
final Map<User, List<WhiteCard>> cards) {
LOG.trace(String.format("roundJudged(%s, %s, %s, %s)", gameId, judgeSessionId, winnerSessionId,
Expand Down

0 comments on commit a0d21cd

Please sign in to comment.