rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix server crash if whitelist.txt is missing

Browse Source
This commit is contained in:
Cohee
2023-04-20 16:10:05 +03:00
committed by GitHub
parent 50792fdef5
commit 325f4170cb
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
server.js
View File

@@ -32,11 +32,15 @@ const webp = require('webp-converter');
const config = require(path.join(process.cwd(), './config.conf')); const config = require(path.join(process.cwd(), './config.conf'));
const server_port = process.env.SILLY_TAVERN_PORT || config.port; const server_port = process.env.SILLY_TAVERN_PORT || config.port;
let whitelistTxt = null; const whitelistPath = path.join(process.cwd(), "./whitelist.txt");
try { let whitelist = config.whitelist;
whitelistTxt = fs.readFileSync(path.join(process.cwd(), "./whitelist.txt"));
} catch (e) {} if (fs.existsSync(whitelistPath)) {
const whitelist = whitelistTxt.toString().split("\n").filter(ip => ip) || config.whitelist; try {
let whitelistTxt = fs.readFileSync(whitelistPath, 'utf-8');
whitelist = whitelistTxt.split("\n").filter(ip => ip).map(ip => ip.trim());
} catch (e) { }
}
const whitelistMode = config.whitelistMode; const whitelistMode = config.whitelistMode;
const autorun = config.autorun; const autorun = config.autorun;
@@ -2500,4 +2504,4 @@ function ensurePublicDirectoriesExist() {
fs.mkdirSync(dir, { recursive: true }); fs.mkdirSync(dir, { recursive: true });
} }
} }
} }