mirror of
				https://gitlab.com/MrFry/mrfrys-node-server
				synced 2025-04-01 20:24:18 +02:00 
			
		
		
		
	Logging node version, and sme formatting
This commit is contained in:
		
							
								
								
									
										17
									
								
								server.js
									
									
									
									
									
								
							
							
						
						
									
										17
									
								
								server.js
									
									
									
									
									
								
							@@ -53,7 +53,8 @@ const fullchainFile = "/etc/letsencrypt/live/qmining.tk/fullchain.pem";
 | 
			
		||||
const chainFile = "/etc/letsencrypt/live/qmining.tk/chain.pem";
 | 
			
		||||
 | 
			
		||||
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 {
 | 
			
		||||
		const key = fs.readFileSync(privkeyFile, "utf8");
 | 
			
		||||
		const cert = fs.readFileSync(fullchainFile, "utf8");
 | 
			
		||||
@@ -220,7 +221,8 @@ function UploadFile(req, res, path, next) {
 | 
			
		||||
		utils.CreatePath(path, true);
 | 
			
		||||
		let d = new Date();
 | 
			
		||||
		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);
 | 
			
		||||
		file.pipe(fstream);
 | 
			
		||||
@@ -229,7 +231,7 @@ function UploadFile(req, res, path, next) {
 | 
			
		||||
			next(fn);
 | 
			
		||||
		});
 | 
			
		||||
		fstream.on('error', function(err) {
 | 
			
		||||
			console.log(err); 
 | 
			
		||||
			console.log(err);
 | 
			
		||||
			res.end("something bad happened :s");
 | 
			
		||||
		});
 | 
			
		||||
	});
 | 
			
		||||
@@ -237,13 +239,13 @@ function UploadFile(req, res, path, next) {
 | 
			
		||||
 | 
			
		||||
app.route('/fosuploader').post(function(req, res, next) {
 | 
			
		||||
	UploadFile(req, res, uloadFiles, (fn) => {
 | 
			
		||||
			res.redirect("/f/" + fn);
 | 
			
		||||
		res.redirect("/f/" + fn);
 | 
			
		||||
	});
 | 
			
		||||
});
 | 
			
		||||
 | 
			
		||||
app.route('/badtestsender').post(function(req, res, next) {
 | 
			
		||||
	UploadFile(req, res, recivedFiles, (fn) => {
 | 
			
		||||
			res.render("uploaded");
 | 
			
		||||
		res.render("uploaded");
 | 
			
		||||
	});
 | 
			
		||||
	Log(req);
 | 
			
		||||
});
 | 
			
		||||
@@ -271,9 +273,10 @@ if (startHTTPS && certsLoaded) {
 | 
			
		||||
	httpsServer.listen(httpsPort);
 | 
			
		||||
	msg += ", and " + httpsPort + " (https)...";
 | 
			
		||||
} 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) {
 | 
			
		||||
	try {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user