nginx changes and invader init
This commit is contained in:
ntr
@@ -1,6 +1,8 @@
|
||||
use uuid::Uuid;
|
||||
use rand::prelude::*;
|
||||
use std::fs::copy;
|
||||
use std::fs::File;
|
||||
use std::io::prelude::*;
|
||||
|
||||
use failure::Error;
|
||||
use failure::err_msg;
|
||||
@@ -22,3 +24,103 @@ pub fn img_molecular_write(id: Uuid) -> Result<Uuid, Error> {
|
||||
|
||||
return Err(err_msg("too many missing molecules. wrong directory?"))
|
||||
}
|
||||
|
||||
|
||||
|
||||
fn invader_img_write(id: Uuid) -> Result<Uuid, Error> {
|
||||
let mut rng = thread_rng();
|
||||
let mut svg = Vec::new();
|
||||
|
||||
write!(&mut svg, "<svg xmlns='http://www.w3.org/2000/svg' version='1.1' viewBox='-250 -250 1000 1000' width='500' height='500'><g>")?;
|
||||
for i in 0..50 {
|
||||
let x = (i % 5) * 50;
|
||||
let y = (i / 5) * 50;
|
||||
|
||||
let colour = match rng.gen_bool(0.5) {
|
||||
true => "whitesmoke",
|
||||
false => "none",
|
||||
};
|
||||
write!(&mut svg, "<rect fill=\"{}\" x=\"{}\" y=\"{}\" width=\"50\" height=\"50\" />", colour, x, y)?;
|
||||
write!(&mut svg, "<rect fill=\"{}\" x=\"{}\" y=\"{}\" width=\"50\" height=\"50\" />", colour, 450 - x, y)?;
|
||||
}
|
||||
|
||||
write!(&mut svg, "</g></svg>")?;
|
||||
|
||||
// println!("{:?}", String::from_utf8(svg.clone())?);
|
||||
|
||||
let dest = format!("/var/lib/mnml/public/imgs/{}.svg", id);
|
||||
println!("molecule dest={:?}", dest);
|
||||
|
||||
let mut file = File::create(dest)?;
|
||||
file.write_all(&svg)?;
|
||||
|
||||
Ok(id)
|
||||
}
|
||||
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn invader_img_test() {
|
||||
invader_img_write(Uuid::new_v4()).unwrap();
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// function createColor() {
|
||||
// //saturation is the whole color spectrum
|
||||
// var h = Math.floor(rand() * 360);
|
||||
// //saturation goes from 40 to 100, it avoids greyish colors
|
||||
// var s = ((rand() * 60) + 40) + '%';
|
||||
// //lightness can be anything from 0 to 100, but probabilities are a bell curve around 50%
|
||||
// var l = ((rand()+rand()+rand()+rand()) * 25) + '%';
|
||||
|
||||
// var color = 'hsl(' + h + ',' + s + ',' + l + ')';
|
||||
// return color;
|
||||
// }
|
||||
|
||||
// function createImageData(size) {
|
||||
// var width = size; // Only support square icons for now
|
||||
// var height = size;
|
||||
|
||||
// var dataWidth = Math.ceil(width / 2);
|
||||
// var mirrorWidth = width - dataWidth;
|
||||
|
||||
// var data = [];
|
||||
// for(var y = 0; y < height; y++) {
|
||||
// var row = [];
|
||||
// for(var x = 0; x < dataWidth; x++) {
|
||||
// // this makes foreground and background color to have a 43% (1/2.3) probability
|
||||
// // spot color has 13% chance
|
||||
// row[x] = Math.floor(rand()*2.3);
|
||||
// }
|
||||
// var r = row.slice(0, mirrorWidth);
|
||||
// r.reverse();
|
||||
// row = row.concat(r);
|
||||
|
||||
// for(var i = 0; i < row.length; i++) {
|
||||
// data.push(row[i]);
|
||||
// }
|
||||
// }
|
||||
|
||||
// return data;
|
||||
// }
|
||||
|
||||
// function buildOpts(opts) {
|
||||
// var newOpts = {};
|
||||
|
||||
// newOpts.seed = opts.seed || Math.floor((Math.random()*Math.pow(10,16))).toString(16);
|
||||
|
||||
// seedrand(newOpts.seed);
|
||||
|
||||
// newOpts.size = opts.size || 8;
|
||||
// newOpts.scale = opts.scale || 4;
|
||||
// newOpts.color = opts.color || createColor();
|
||||
// newOpts.bgcolor = opts.bgcolor || createColor();
|
||||
// newOpts.spotcolor = opts.spotcolor || createColor();
|
||||
|
||||
// return newOpts;
|
||||
// }
|
||||
+73
-73
@@ -27,86 +27,86 @@ extern crate cookie;
|
||||
extern crate tungstenite;
|
||||
extern crate crossbeam_channel;
|
||||
|
||||
mod account;
|
||||
mod construct;
|
||||
mod effect;
|
||||
mod game;
|
||||
mod instance;
|
||||
mod item;
|
||||
// mod account;
|
||||
// mod construct;
|
||||
// mod effect;
|
||||
// mod game;
|
||||
// mod instance;
|
||||
// mod item;
|
||||
mod img;
|
||||
mod mob;
|
||||
mod mtx;
|
||||
mod names;
|
||||
mod net;
|
||||
mod payments;
|
||||
mod pg;
|
||||
mod player;
|
||||
mod pubsub;
|
||||
mod rpc;
|
||||
mod skill;
|
||||
mod spec;
|
||||
mod util;
|
||||
mod vbox;
|
||||
mod warden;
|
||||
mod ws;
|
||||
// mod mob;
|
||||
// mod mtx;
|
||||
// mod names;
|
||||
// mod net;
|
||||
// mod payments;
|
||||
// mod pg;
|
||||
// mod player;
|
||||
// mod pubsub;
|
||||
// mod rpc;
|
||||
// mod skill;
|
||||
// mod spec;
|
||||
// mod util;
|
||||
// mod vbox;
|
||||
// mod warden;
|
||||
// mod ws;
|
||||
|
||||
use std::thread::{sleep, spawn};
|
||||
use std::time::{Duration};
|
||||
use dotenv::dotenv;
|
||||
// use std::thread::{sleep, spawn};
|
||||
// use std::time::{Duration};
|
||||
// use dotenv::dotenv;
|
||||
|
||||
use pubsub::pg_listen;
|
||||
use warden::warden;
|
||||
// use pubsub::pg_listen;
|
||||
// use warden::warden;
|
||||
|
||||
fn setup_logger() -> Result<(), fern::InitError> {
|
||||
fern::Dispatch::new()
|
||||
.format(|out, message, record| {
|
||||
out.finish(format_args!(
|
||||
"{}[{}][{}] {}",
|
||||
chrono::Local::now().format("[%Y-%m-%d][%H:%M:%S]"),
|
||||
record.target(),
|
||||
record.level(),
|
||||
message
|
||||
))
|
||||
})
|
||||
.level_for("postgres", log::LevelFilter::Info)
|
||||
.level_for("iron", log::LevelFilter::Info)
|
||||
.level(log::LevelFilter::Info)
|
||||
.chain(std::io::stdout())
|
||||
.chain(fern::log_file("/var/log/mnml/mnml.log")?)
|
||||
.apply()?;
|
||||
Ok(())
|
||||
}
|
||||
// fn setup_logger() -> Result<(), fern::InitError> {
|
||||
// fern::Dispatch::new()
|
||||
// .format(|out, message, record| {
|
||||
// out.finish(format_args!(
|
||||
// "{}[{}][{}] {}",
|
||||
// chrono::Local::now().format("[%Y-%m-%d][%H:%M:%S]"),
|
||||
// record.target(),
|
||||
// record.level(),
|
||||
// message
|
||||
// ))
|
||||
// })
|
||||
// .level_for("postgres", log::LevelFilter::Info)
|
||||
// .level_for("iron", log::LevelFilter::Info)
|
||||
// .level(log::LevelFilter::Info)
|
||||
// .chain(std::io::stdout())
|
||||
// .chain(fern::log_file("/var/log/mnml/mnml.log")?)
|
||||
// .apply()?;
|
||||
// Ok(())
|
||||
// }
|
||||
|
||||
fn main() {
|
||||
dotenv().ok();
|
||||
setup_logger().unwrap();
|
||||
// fn main() {
|
||||
// dotenv().ok();
|
||||
// setup_logger().unwrap();
|
||||
|
||||
let pool = pg::create_pool();
|
||||
// let pool = pg::create_pool();
|
||||
|
||||
let ws_pool = pool.clone();
|
||||
let http_pool = pool.clone();
|
||||
let warden_pool = pool.clone();
|
||||
let pubsub_pool = pool.clone();
|
||||
// let ws_pool = pool.clone();
|
||||
// let http_pool = pool.clone();
|
||||
// let warden_pool = pool.clone();
|
||||
// let pubsub_pool = pool.clone();
|
||||
|
||||
spawn(move || {
|
||||
loop {
|
||||
let db_connection = warden_pool.get().expect("unable to get db connection");
|
||||
if let Err(e) = warden(db_connection) {
|
||||
info!("{:?}", e);
|
||||
}
|
||||
sleep(Duration::new(1, 0));
|
||||
}
|
||||
});
|
||||
// spawn(move || {
|
||||
// loop {
|
||||
// let db_connection = warden_pool.get().expect("unable to get db connection");
|
||||
// if let Err(e) = warden(db_connection) {
|
||||
// info!("{:?}", e);
|
||||
// }
|
||||
// sleep(Duration::new(1, 0));
|
||||
// }
|
||||
// });
|
||||
|
||||
spawn(move || loop {
|
||||
let pubsub_conn = pubsub_pool.get().expect("could not get pubsub pg connection");
|
||||
match pg_listen(pubsub_conn) {
|
||||
Ok(_) => warn!("pg listen closed"),
|
||||
Err(e) => warn!("pg_listen error {:?}", e),
|
||||
}
|
||||
});
|
||||
// spawn(move || loop {
|
||||
// let pubsub_conn = pubsub_pool.get().expect("could not get pubsub pg connection");
|
||||
// match pg_listen(pubsub_conn) {
|
||||
// Ok(_) => warn!("pg listen closed"),
|
||||
// Err(e) => warn!("pg_listen error {:?}", e),
|
||||
// }
|
||||
// });
|
||||
|
||||
spawn(move || net::start(http_pool));
|
||||
ws::start(ws_pool);
|
||||
info!("server started");
|
||||
}
|
||||
// spawn(move || net::start(http_pool));
|
||||
// ws::start(ws_pool);
|
||||
// info!("server started");
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user