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

Update hystrix command names

This commit is contained in:
Moxie Marlinspike 2018-11-03 06:15:42 -07:00
parent 1dd3766c5f
commit 79c05c37dd
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/org/whispersystems/textsecuregcm/storage/AccountsManager.java
View File

@ -136,7 +136,8 @@ public class AccountsManager {
private void redisSet(String number, Account account, boolean optional) { private void redisSet(String number, Account account, boolean optional) {
new HystrixCommand<Boolean>(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GroupKeys.REDIS_CACHE)) new HystrixCommand<Boolean>(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GroupKeys.REDIS_CACHE))
.andCommandKey(HystrixCommandKey.Factory.asKey(AccountsManager.class.getSimpleName() + ".redisSet"))) { .andCommandKey(HystrixCommandKey.Factory.asKey("accountsRedisSet")))
{
@Override @Override
protected Boolean run() { protected Boolean run() {
try (Jedis jedis = cacheClient.getWriteResource(); try (Jedis jedis = cacheClient.getWriteResource();
@ -160,7 +161,7 @@ public class AccountsManager {
private Optional<Account> redisGet(String number) { private Optional<Account> redisGet(String number) {
return new HystrixCommand<Optional<Account>>(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GroupKeys.REDIS_CACHE)) return new HystrixCommand<Optional<Account>>(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GroupKeys.REDIS_CACHE))
.andCommandKey(HystrixCommandKey.Factory.asKey(AccountsManager.class.getSimpleName() + ".redisGet"))) .andCommandKey(HystrixCommandKey.Factory.asKey("accountsRedisGet")))
{ {
@Override @Override
protected Optional<Account> run() { protected Optional<Account> run() {
@ -168,7 +169,7 @@ public class AccountsManager {
Timer.Context timer = redisGetTimer.time()) Timer.Context timer = redisGetTimer.time())
{ {
String json = jedis.get(getKey(number)); String json = jedis.get(getKey(number));
if (json != null) return Optional.of(mapper.readValue(json, Account.class)); if (json != null) return Optional.of(mapper.readValue(json, Account.class));
else return Optional.empty(); else return Optional.empty();
} catch (IOException e) { } catch (IOException e) {
@ -186,7 +187,7 @@ public class AccountsManager {
private Optional<Account> databaseGet(String number) { private Optional<Account> databaseGet(String number) {
return new HystrixCommand<Optional<Account>>(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GroupKeys.DATABASE_ACCOUNTS)) return new HystrixCommand<Optional<Account>>(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GroupKeys.DATABASE_ACCOUNTS))
.andCommandKey(HystrixCommandKey.Factory.asKey(AccountsManager.class.getSimpleName() + ".databaseGet"))) .andCommandKey(HystrixCommandKey.Factory.asKey("accountsDatabaseGet")))
{ {
@Override @Override
protected Optional<Account> run() { protected Optional<Account> run() {
@ -197,7 +198,7 @@ public class AccountsManager {
private boolean databaseCreate(Account account) { private boolean databaseCreate(Account account) {
return new HystrixCommand<Boolean>(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GroupKeys.DATABASE_ACCOUNTS)) return new HystrixCommand<Boolean>(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GroupKeys.DATABASE_ACCOUNTS))
.andCommandKey(HystrixCommandKey.Factory.asKey(AccountsManager.class.getSimpleName() + ".databaseCreate"))) .andCommandKey(HystrixCommandKey.Factory.asKey("accountsDatabaseCreate")))
{ {
@Override @Override
protected Boolean run() { protected Boolean run() {
@ -208,7 +209,7 @@ public class AccountsManager {
private void databaseUpdate(Account account) { private void databaseUpdate(Account account) {
new HystrixCommand<Void>(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GroupKeys.DATABASE_ACCOUNTS)) new HystrixCommand<Void>(Setter.withGroupKey(HystrixCommandGroupKey.Factory.asKey(GroupKeys.DATABASE_ACCOUNTS))
.andCommandKey(HystrixCommandKey.Factory.asKey(AccountsManager.class.getSimpleName() + ".databaseUpdate"))) .andCommandKey(HystrixCommandKey.Factory.asKey("accountsDatabaseUpdate")))
{ {
@Override @Override
protected Void run() { protected Void run() {