Browse Source

Moved default room type to config.

pull/195/head
Simon Eisenmann 10 years ago
parent
commit
2be68c554c
  1. 2
      src/app/spreed-webrtc-server/config.go
  2. 18
      src/app/spreed-webrtc-server/room_manager.go

2
src/app/spreed-webrtc-server/config.go

@ -52,6 +52,7 @@ type Config struct {
globalRoomID string // Id of the global room (not exported to Javascript) globalRoomID string // Id of the global room (not exported to Javascript)
contentSecurityPolicy string // HTML content security policy contentSecurityPolicy string // HTML content security policy
contentSecurityPolicyReportOnly string // HTML content security policy in report only mode contentSecurityPolicyReportOnly string // HTML content security policy in report only mode
roomTypeDefault string // New rooms default to this type
} }
func NewConfig(container phoenix.Container, tokens bool) *Config { func NewConfig(container phoenix.Container, tokens bool) *Config {
@ -127,6 +128,7 @@ func NewConfig(container phoenix.Container, tokens bool) *Config {
globalRoomID: container.GetStringDefault("app", "globalRoom", ""), globalRoomID: container.GetStringDefault("app", "globalRoom", ""),
contentSecurityPolicy: container.GetStringDefault("app", "contentSecurityPolicy", ""), contentSecurityPolicy: container.GetStringDefault("app", "contentSecurityPolicy", ""),
contentSecurityPolicyReportOnly: container.GetStringDefault("app", "contentSecurityPolicyReportOnly", ""), contentSecurityPolicyReportOnly: container.GetStringDefault("app", "contentSecurityPolicyReportOnly", ""),
roomTypeDefault: "Room",
} }
} }

18
src/app/spreed-webrtc-server/room_manager.go

@ -53,21 +53,17 @@ type roomManager struct {
sync.RWMutex sync.RWMutex
*Config *Config
OutgoingEncoder OutgoingEncoder
roomTable map[string]RoomWorker roomTable map[string]RoomWorker
globalRoomID string globalRoomID string
defaultRoomID string defaultRoomID string
roomTypeDefault string
} }
func NewRoomManager(config *Config, encoder OutgoingEncoder) RoomManager { func NewRoomManager(config *Config, encoder OutgoingEncoder) RoomManager {
rm := &roomManager{ rm := &roomManager{
sync.RWMutex{}, RWMutex: sync.RWMutex{},
config, Config: config,
encoder, OutgoingEncoder: encoder,
make(map[string]RoomWorker), roomTable: make(map[string]RoomWorker),
"",
"",
"Room",
} }
rm.globalRoomID = rm.MakeRoomID(config.globalRoomID, "") rm.globalRoomID = rm.MakeRoomID(config.globalRoomID, "")
rm.defaultRoomID = rm.MakeRoomID("", "") rm.defaultRoomID = rm.MakeRoomID("", "")

Loading…
Cancel
Save