diff options
| author | Jesse Hallam <jesse.hallam@gmail.com> | 2018-10-25 13:25:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-10-25 13:25:27 -0400 |
| commit | 937b6480d534b3051cadf4a892a9aa210bec579a (patch) | |
| tree | 7f8bcbde439f25cc9c0e405329ddf8a788208319 /app | |
| parent | 1074a1c7ab0769b0da3525282fcabf961e2ddfce (diff) | |
| download | chat-937b6480d534b3051cadf4a892a9aa210bec579a.tar.gz chat-937b6480d534b3051cadf4a892a9aa210bec579a.tar.bz2 chat-937b6480d534b3051cadf4a892a9aa210bec579a.zip | |
* MM-12342: merge the experimental channel store
* gofmt after upgrading to go 1.11
Diffstat (limited to 'app')
| -rw-r--r-- | app/app.go | 8 | ||||
| -rw-r--r-- | app/diagnostics.go | 17 |
2 files changed, 8 insertions, 17 deletions
diff --git a/app/app.go b/app/app.go index d8974a48c..38756a936 100644 --- a/app/app.go +++ b/app/app.go @@ -219,14 +219,6 @@ func New(options ...Option) (outApp *App, outErr error) { app.Srv.Store = app.newStore() - app.AddConfigListener(func(_, current *model.Config) { - if current.SqlSettings.EnablePublicChannelsMaterialization != nil && !*current.SqlSettings.EnablePublicChannelsMaterialization { - app.Srv.Store.Channel().DisableExperimentalPublicChannelsMaterialization() - } else { - app.Srv.Store.Channel().EnableExperimentalPublicChannelsMaterialization() - } - }) - if err := app.ensureAsymmetricSigningKey(); err != nil { return nil, errors.Wrapf(err, "unable to ensure asymmetric signing key") } diff --git a/app/diagnostics.go b/app/diagnostics.go index c9acc2739..3c24a9284 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -306,15 +306,14 @@ func (a *App) trackConfig() { }) a.SendDiagnostic(TRACK_CONFIG_SQL, map[string]interface{}{ - "driver_name": *cfg.SqlSettings.DriverName, - "trace": cfg.SqlSettings.Trace, - "max_idle_conns": *cfg.SqlSettings.MaxIdleConns, - "conn_max_lifetime_milliseconds": *cfg.SqlSettings.ConnMaxLifetimeMilliseconds, - "max_open_conns": *cfg.SqlSettings.MaxOpenConns, - "data_source_replicas": len(cfg.SqlSettings.DataSourceReplicas), - "data_source_search_replicas": len(cfg.SqlSettings.DataSourceSearchReplicas), - "query_timeout": *cfg.SqlSettings.QueryTimeout, - "enable_public_channels_materialization": *cfg.SqlSettings.EnablePublicChannelsMaterialization, + "driver_name": *cfg.SqlSettings.DriverName, + "trace": cfg.SqlSettings.Trace, + "max_idle_conns": *cfg.SqlSettings.MaxIdleConns, + "conn_max_lifetime_milliseconds": *cfg.SqlSettings.ConnMaxLifetimeMilliseconds, + "max_open_conns": *cfg.SqlSettings.MaxOpenConns, + "data_source_replicas": len(cfg.SqlSettings.DataSourceReplicas), + "data_source_search_replicas": len(cfg.SqlSettings.DataSourceSearchReplicas), + "query_timeout": *cfg.SqlSettings.QueryTimeout, }) a.SendDiagnostic(TRACK_CONFIG_LOG, map[string]interface{}{ |