albert/mrfrys-node-server
1
0
Fork 0
mirror of https://gitlab.com/MrFry/mrfrys-node-server synced 2025-04-01 20:24:18 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Logging node version, and sme formatting

Browse Source
This commit is contained in:
YourFriendlyNeighborhoodDealer
2019-03-17 08:49:26 +01:00
parent ef7066474c
commit 20488d90cb
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
server.js
View File

@@ -53,7 +53,8 @@ const fullchainFile = "/etc/letsencrypt/live/qmining.tk/fullchain.pem";
const chainFile = "/etc/letsencrypt/live/qmining.tk/chain.pem"; const chainFile = "/etc/letsencrypt/live/qmining.tk/chain.pem";
var certsLoaded = false; var certsLoaded = false;
if (startHTTPS && utils.FileExists(privkeyFile) && utils.FileExists(fullchainFile) && utils.FileExists(chainFile)) { if (startHTTPS && utils.FileExists(privkeyFile) && utils.FileExists(fullchainFile) && utils.FileExists(
chainFile)) {
try { try {
const key = fs.readFileSync(privkeyFile, "utf8"); const key = fs.readFileSync(privkeyFile, "utf8");
const cert = fs.readFileSync(fullchainFile, "utf8"); const cert = fs.readFileSync(fullchainFile, "utf8");
@@ -220,7 +221,8 @@ function UploadFile(req, res, path, next) {
utils.CreatePath(path, true); utils.CreatePath(path, true);
let d = new Date(); let d = new Date();
let fsplit = filename.split('.'); let fsplit = filename.split('.');
let fn = d.getHours() + "" + d.getMinutes() + "" + d.getSeconds() + "." + fsplit[fsplit.length - 1]; let fn = d.getHours() + "" + d.getMinutes() + "" + d.getSeconds() + "." + fsplit[fsplit.length -
1];
fstream = fs.createWriteStream(path + "/" + fn); fstream = fs.createWriteStream(path + "/" + fn);
file.pipe(fstream); file.pipe(fstream);
@@ -229,7 +231,7 @@ function UploadFile(req, res, path, next) {
next(fn); next(fn);
}); });
fstream.on('error', function(err) { fstream.on('error', function(err) {
console.log(err); console.log(err);
res.end("something bad happened :s"); res.end("something bad happened :s");
}); });
}); });
@@ -237,13 +239,13 @@ function UploadFile(req, res, path, next) {
app.route('/fosuploader').post(function(req, res, next) { app.route('/fosuploader').post(function(req, res, next) {
UploadFile(req, res, uloadFiles, (fn) => { UploadFile(req, res, uloadFiles, (fn) => {
res.redirect("/f/" + fn); res.redirect("/f/" + fn);
}); });
}); });
app.route('/badtestsender').post(function(req, res, next) { app.route('/badtestsender').post(function(req, res, next) {
UploadFile(req, res, recivedFiles, (fn) => { UploadFile(req, res, recivedFiles, (fn) => {
res.render("uploaded"); res.render("uploaded");
}); });
Log(req); Log(req);
}); });
@@ -271,9 +273,10 @@ if (startHTTPS && certsLoaded) {
httpsServer.listen(httpsPort); httpsServer.listen(httpsPort);
msg += ", and " + httpsPort + " (https)..."; msg += ", and " + httpsPort + " (https)...";
} else { } else {
logger.Log("Cert files does not exists, starting http only!" ,logger.GetColor("redbg")); logger.Log("Cert files does not exists, starting http only!", logger.GetColor("redbg"));
} }
logger.Log(msg ,logger.GetColor("yellow")); logger.Log(msg, logger.GetColor("yellow"));
logger.Log("Node version: " + process.version);
function Log(req, toFile, sc) { function Log(req, toFile, sc) {
try { try {