MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add some meters

This commit is contained in:
Moxie Marlinspike 2018-12-21 16:44:20 -08:00
parent 65234a5a9a
commit 172bc81dd2
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/whispersystems/textsecuregcm/controllers/AccountController.java
View File

@ -82,6 +82,8 @@ public class AccountController {
private final Logger logger = LoggerFactory.getLogger(AccountController.class); private final Logger logger = LoggerFactory.getLogger(AccountController.class);
private final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME); private final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
private final Meter newUserMeter = metricRegistry.meter(name(AccountController.class, "brand_new_user")); private final Meter newUserMeter = metricRegistry.meter(name(AccountController.class, "brand_new_user"));
private final Meter blockedHostMeter = metricRegistry.meter(name(AccountController.class, "blocked_host"));
private final Meter filteredHostMeter = metricRegistry.meter(name(AccountController.class, "filtered_host"));
private final PendingAccountsManager pendingAccounts; private final PendingAccountsManager pendingAccounts;
private final AccountsManager accounts; private final AccountsManager accounts;
@ -142,12 +144,14 @@ public class AccountController {
for (AbusiveHostRule abuseRule : abuseRules) { for (AbusiveHostRule abuseRule : abuseRules) {
if (abuseRule.isBlocked()) { if (abuseRule.isBlocked()) {
logger.info("Blocked host: " + transport + ", " + number + ", " + requester + " (" + forwardedFor + ")"); logger.info("Blocked host: " + transport + ", " + number + ", " + requester + " (" + forwardedFor + ")");
blockedHostMeter.mark();
return Response.ok().build(); return Response.ok().build();
} }
if (!abuseRule.getRegions().isEmpty()) { if (!abuseRule.getRegions().isEmpty()) {
if (abuseRule.getRegions().stream().noneMatch(number::startsWith)) { if (abuseRule.getRegions().stream().noneMatch(number::startsWith)) {
logger.info("Restricted host: " + transport + ", " + number + ", " + requester + " (" + forwardedFor + ")"); logger.info("Restricted host: " + transport + ", " + number + ", " + requester + " (" + forwardedFor + ")");
filteredHostMeter.mark();
return Response.ok().build(); return Response.ok().build();
} }
} }