File tree 2 files changed +2
-11
lines changed
2 files changed +2
-11
lines changed Original file line number Diff line number Diff line change @@ -10,7 +10,6 @@ import { WebSocketServer } from "@spt/servers/WebSocketServer";
10
10
import { IHttpListener } from "@spt/servers/http/IHttpListener" ;
11
11
import { LocalisationService } from "@spt/services/LocalisationService" ;
12
12
import { inject , injectAll , injectable } from "tsyringe" ;
13
- import { DatabaseService } from "@spt/services/DatabaseService" ;
14
13
15
14
@injectable ( )
16
15
export class HttpServer {
@@ -19,7 +18,6 @@ export class HttpServer {
19
18
20
19
constructor (
21
20
@inject ( "PrimaryLogger" ) protected logger : ILogger ,
22
- @inject ( "DatabaseService" ) protected databaseService : DatabaseService ,
23
21
@inject ( "HttpServerHelper" ) protected httpServerHelper : HttpServerHelper ,
24
22
@inject ( "LocalisationService" ) protected localisationService : LocalisationService ,
25
23
@injectAll ( "HttpListener" ) protected httpListeners : IHttpListener [ ] ,
@@ -36,12 +34,6 @@ export class HttpServer {
36
34
public load ( ) : void {
37
35
this . started = false ;
38
36
39
- // If the database couldn't be validated, don't start the server
40
- if ( ! this . databaseService . isDatabaseValid ( ) )
41
- {
42
- return ;
43
- }
44
-
45
37
/* create server */
46
38
const httpServer : Server = http . createServer ( ) ;
47
39
Original file line number Diff line number Diff line change @@ -61,9 +61,8 @@ export class PostDbLoadService {
61
61
// Kill the startup if not.
62
62
// TODO: We can probably remove this in a couple versions
63
63
this . databaseService . validateDatabase ( ) ;
64
- if ( ! this . databaseService . isDatabaseValid ( ) )
65
- {
66
- return ;
64
+ if ( ! this . databaseService . isDatabaseValid ( ) ) {
65
+ throw new Error ( "Server start failure" ) ;
67
66
}
68
67
69
68
this . addCustomLooseLootPositions ( ) ;
You can’t perform that action at this time.
0 commit comments