diff options
| author |  Vitaly Takmazov | 2023-06-26 08:30:46 +0300 |
|---|---|---|
| committer | Vitaly Takmazov | 2023-06-26 09:37:31 +0300 |
| commit | 714779c719894a07156964f66591352498a4597b (patch) | |
| tree | d3140768b1000941d86f8768db3a0c16333151d1 /src | |
| parent | 26ce11f610eff622c7949bdd4eeee75c5be9f3d9 (diff) | |
ActivityPub: cache all profile exception paths
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/com/juick/service/ActivityPubService.java | 4 | ||||
| -rw-r--r-- | src/main/java/com/juick/www/api/activity/Profile.java | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/java/com/juick/service/ActivityPubService.java b/src/main/java/com/juick/service/ActivityPubService.java index 3f56c40c..c2d3f1e7 100644 --- a/src/main/java/com/juick/service/ActivityPubService.java +++ b/src/main/java/com/juick/service/ActivityPubService.java @@ -127,7 +127,7 @@ public class ActivityPubService extends BaseJdbcService implements SocialService getJdbcTemplate().update("DELETE FROM followers WHERE acct=?", acct); } - @Cacheable("profiles") + @Cacheable(value = "profiles", key="#contextUri") public Optional<Context> get(URI contextUri) { Instant now = Instant.now(); String requestDate = DateFormattersHolder.getHttpDateFormatter().format(now); @@ -150,7 +150,7 @@ public class ActivityPubService extends BaseJdbcService implements SocialService return Optional.of(context); } } - } catch (IOException e) { + } catch (Exception e) { logger.warn("HTTP Signature exception reading {}: {}", contextUri.toASCIIString(), e.getMessage()); } return Optional.empty(); diff --git a/src/main/java/com/juick/www/api/activity/Profile.java b/src/main/java/com/juick/www/api/activity/Profile.java index 0a6726ee..aa8f0394 100644 --- a/src/main/java/com/juick/www/api/activity/Profile.java +++ b/src/main/java/com/juick/www/api/activity/Profile.java @@ -279,7 +279,6 @@ public class Profile { (currentUrl, nextUrl) -> String.format("%s\n%s", currentUrl, nextUrl)); } - @CacheEvict(cacheNames = "profiles", key = "{ #visitor.uri }") @PostMapping(value = "/api/inbox", consumes = { Context.LD_JSON_MEDIA_TYPE, Context.ACTIVITY_MEDIA_TYPE, Context.ACTIVITYSTREAMS_PROFILE_MEDIA_TYPE, MediaType.APPLICATION_JSON_VALUE }) public ResponseEntity<CommandResult> processInbox(@Parameter(hidden = true) User visitor, InputStream body) |