@@ -108,9 +108,11 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
108108
109109 acctStore := accounts .NewSQLStore (sqlStore .BaseDB , clock )
110110 sessStore := session .NewSQLStore (sqlStore .BaseDB , clock )
111+ firewallStore := firewalldb .NewSQLDB (sqlStore .BaseDB )
111112
112113 stores .accounts = acctStore
113114 stores .sessions = sessStore
115+ stores .firewall = firewalldb .NewDB (firewallStore )
114116 stores .closeFns ["sqlite" ] = sqlStore .BaseDB .Close
115117
116118 case DatabaseBackendPostgres :
@@ -121,9 +123,11 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
121123
122124 acctStore := accounts .NewSQLStore (sqlStore .BaseDB , clock )
123125 sessStore := session .NewSQLStore (sqlStore .BaseDB , clock )
126+ firewallStore := firewalldb .NewSQLDB (sqlStore .BaseDB )
124127
125128 stores .accounts = acctStore
126129 stores .sessions = sessStore
130+ stores .firewall = firewalldb .NewDB (firewallStore )
127131 stores .closeFns ["postgres" ] = sqlStore .BaseDB .Close
128132
129133 default :
@@ -157,7 +161,10 @@ func NewStores(cfg *Config, clock clock.Clock) (*stores, error) {
157161 err )
158162 }
159163
160- stores .firewall = firewalldb .NewDB (firewallBoltDB )
164+ if stores .firewall == nil {
165+ stores .firewall = firewalldb .NewDB (firewallBoltDB )
166+ }
167+
161168 stores .firewallBolt = firewallBoltDB
162169 stores .closeFns ["bbolt-firewalldb" ] = firewallBoltDB .Close
163170
0 commit comments