diff options
author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-07-02 13:03:42 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-02 13:03:42 +0200 |
commit | df5b3c4a3717ecb6fe490aa354baeadab060e720 (patch) | |
tree | 157f6bc0dca7eaf515672e826944b0af2b4ce055 /container-disc | |
parent | 7537c42fa661952916cf91eebbb75e6984505100 (diff) |
Revert "Jonmv/reapply session cache with injected config"
Diffstat (limited to 'container-disc')
-rw-r--r-- | container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java index f43c1fcffd6..0e4c4446778 100644 --- a/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java +++ b/container-disc/src/main/java/com/yahoo/container/jdisc/ConfiguredApplication.java @@ -18,6 +18,7 @@ import com.yahoo.container.di.config.Subscriber; import com.yahoo.container.di.config.SubscriberFactory; import com.yahoo.container.http.filter.FilterChainRepository; import com.yahoo.container.jdisc.component.Deconstructor; +import com.yahoo.container.jdisc.messagebus.SessionCache; import com.yahoo.container.jdisc.metric.DisableGuiceMetric; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.application.Application; @@ -76,6 +77,7 @@ public final class ConfiguredApplication implements Application { // to config to make sure that container will be registered in slobrok (by {@link com.yahoo.jrt.slobrok.api.Register}) // if slobrok config changes (typically slobroks moving to other nodes) private final Optional<SlobrokConfigSubscriber> slobrokConfigSubscriber; + private final SessionCache sessionCache; //TODO: FilterChainRepository should instead always be set up in the model. private final FilterChainRepository defaultFilterChainRepository = @@ -125,6 +127,7 @@ public final class ConfiguredApplication implements Application { this.slobrokConfigSubscriber = (subscriberFactory instanceof CloudSubscriberFactory) ? Optional.of(new SlobrokConfigSubscriber(configId)) : Optional.empty(); + this.sessionCache = new SessionCache(configId); this.restrictedOsgiFramework = new DisableOsgiFramework(new RestrictedBundleContext(osgiFramework.bundleContext())); } @@ -346,6 +349,7 @@ public final class ConfiguredApplication implements Application { bind(OsgiFramework.class).toInstance(restrictedOsgiFramework); bind(com.yahoo.jdisc.Timer.class).toInstance(timerSingleton); bind(FilterChainRepository.class).toInstance(defaultFilterChainRepository); + bind(SessionCache.class).toInstance(sessionCache); // Needed by e.g. FeedHandler } }); } |