Merge pull request #490 from mattrasband/support-dynamic-sessions-in-stores

Allow stores to fall back to global settings for dynamic sessions

Author: ackleymi

filestore.go

@@ -61,10 +61,18 @@ func NewFileStoreFactory(settings *Settings) MessageStoreFactory {
 
 // Create creates a new FileStore implementation of the MessageStore interface.
 func (f fileStoreFactory) Create(sessionID SessionID) (msgStore MessageStore, err error) {
+	globalSettings := f.settings.GlobalSettings()
+	dynamicSessions, _ := globalSettings.BoolSetting(config.DynamicSessions)
+
 	sessionSettings, ok := f.settings.SessionSettings()[sessionID]
 	if !ok {
-		return nil, fmt.Errorf("unknown session: %v", sessionID)
+		if dynamicSessions {
+			sessionSettings = globalSettings
+		} else {
+			return nil, fmt.Errorf("unknown session: %v", sessionID)
+		}
 	}
+
 	dirname, err := sessionSettings.Setting(config.FileStorePath)
 	if err != nil {
 		return nil, err

mongostore.go

@@ -61,9 +61,16 @@ func NewMongoStoreFactoryPrefixed(settings *Settings, collectionsPrefix string)
 
 // Create creates a new MongoStore implementation of the MessageStore interface.
 func (f mongoStoreFactory) Create(sessionID SessionID) (msgStore MessageStore, err error) {
+	globalSettings := f.settings.GlobalSettings()
+	dynamicSessions, _ := globalSettings.BoolSetting(config.DynamicSessions)
+
 	sessionSettings, ok := f.settings.SessionSettings()[sessionID]
 	if !ok {
-		return nil, fmt.Errorf("unknown session: %v", sessionID)
+		if dynamicSessions {
+			sessionSettings = globalSettings
+		} else {
+			return nil, fmt.Errorf("unknown session: %v", sessionID)
+		}
 	}
 	mongoConnectionURL, err := sessionSettings.Setting(config.MongoStoreConnection)
 	if err != nil {

sqlstore.go

@@ -67,10 +67,18 @@ func NewSQLStoreFactory(settings *Settings) MessageStoreFactory {
 
 // Create creates a new SQLStore implementation of the MessageStore interface.
 func (f sqlStoreFactory) Create(sessionID SessionID) (msgStore MessageStore, err error) {
+	globalSettings := f.settings.GlobalSettings()
+	dynamicSessions, _ := globalSettings.BoolSetting(config.DynamicSessions)
+
 	sessionSettings, ok := f.settings.SessionSettings()[sessionID]
 	if !ok {
-		return nil, fmt.Errorf("unknown session: %v", sessionID)
+		if dynamicSessions {
+			sessionSettings = globalSettings
+		} else {
+			return nil, fmt.Errorf("unknown session: %v", sessionID)
+		}
 	}
+
 	sqlDriver, err := sessionSettings.Setting(config.SQLStoreDriver)
 	if err != nil {
 		return nil, err