feat: rewrite using actix

Author: stepankuzmin

.travis.yml

@@ -21,7 +21,7 @@ before_script:
 - sudo apt-get install -y postgresql-9.6-postgis-2.4
 - psql -U postgres -c 'create database test'
 - psql -U postgres -d test -c 'create extension postgis'
-- psql -U postgres -d test -f tests/fixtures/points.sql
+# - psql -U postgres -d test -f tests/fixtures/points.sql
 
 script:
 - true

Cargo.lock

@@ -3,27 +3,17 @@ name = "martin"
 version = "0.1.0"
 authors = ["Stepan Kuzmin <to.stepan.kuzmin@gmail.com>"]
 
-[[bin]]
-name = "martin"
-path = "src/main.rs"
-
 [dependencies]
-env_logger = "0.5.1"
-iron = "0.6.0"
-iron-test = "0.6.0"
-lazy_static = "0.2.11"
-log = "0.4.1"
-logger = "0.4.0"
-lru = "0.1.7"
-mapbox_expressions_to_sql = { git = "https://github.com/stepankuzmin/rust-mapbox-expressions-to-sql" }
-persistent = "0.4.0"
+actix = "0.5"
+actix-web = "0.4"
+env_logger = "0.5"
+futures = "0.1"
+log = "0.4"
+mapbox_expressions_to_sql = "0.1.0"
 postgres = { version = "0.15", features = ["with-time", "with-uuid", "with-serde_json"] }
-r2d2 = "0.7.4"
-r2d2_postgres = "0.13.0"
-regex = "0.2.2"
-rererouter = "0.1.1"
+r2d2 = "0.8"
+r2d2_postgres = "0.14"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-tilejson = "0.1.0"
-urlencoded = "0.6.0"
+tilejson = "0.1"

Cargo.toml

@@ -1,4 +1,4 @@
-FROM ekidd/rust-musl-builder:1.23.0 as builder
+FROM ekidd/rust-musl-builder:1.25.0 as builder
 
 ADD . .
 RUN sudo chmod -R 0777 *

Dockerfile

@@ -17,6 +17,13 @@ PostGIS [Mapbox Vector Tiles](https://github.com/mapbox/vector-tile-spec) server
 
     DATABASE_URL=postgres://postgres:password@localhost:5432/test martin
 
+## Environment variables
+
+    DATABASE_URL
+    DATABASE_POOL_SIZE
+    WORKER_PROCESSES
+    KEEP_ALIVE
+
 ## Using with Docker
 
     docker run -d —rm —name martin \

LICENSE

@@ -0,0 +1,44 @@
+use actix::prelude::*;
+
+use super::messages;
+use super::worker_actor::WorkerActor;
+
+pub struct CoordinatorActor {
+  workers: Vec<Addr<Syn, WorkerActor>>,
+}
+
+impl Default for CoordinatorActor {
+  fn default() -> CoordinatorActor {
+    CoordinatorActor { workers: vec![] }
+  }
+}
+
+impl Actor for CoordinatorActor {
+  type Context = Context<Self>;
+
+  fn started(&mut self, _ctx: &mut Self::Context) {
+    info!("Starting CoordinatorActor");
+  }
+}
+
+impl Handler<messages::Connect> for CoordinatorActor {
+  type Result = Addr<Syn, WorkerActor>;
+
+  fn handle(&mut self, msg: messages::Connect, _: &mut Context<Self>) -> Self::Result {
+    info!("WorkerActor connected");
+    self.workers.push(msg.addr.clone());
+    msg.addr
+  }
+}
+
+impl Handler<messages::RefreshSources> for CoordinatorActor {
+  type Result = ();
+
+  fn handle(&mut self, msg: messages::RefreshSources, _: &mut Context<Self>) -> Self::Result {
+    for worker in &self.workers {
+      worker.do_send(messages::RefreshSources {
+        sources: msg.sources.clone(),
+      });
+    }
+  }
+}

README.md

@@ -1,28 +1,47 @@
+use actix::prelude::*;
+use r2d2_postgres::{PostgresConnectionManager, TlsMode};
+use r2d2::{Pool, PooledConnection};
 use std::error::Error;
+use std::io;
 
-use iron::typemap::Key;
-use iron::prelude::{Plugin, Request};
-use persistent::Read;
-use r2d2::{Config, Pool, PooledConnection};
-use r2d2_postgres::{PostgresConnectionManager, TlsMode};
+use super::messages;
+use super::source::{get_sources, Sources, Tile};
 
 pub type PostgresPool = Pool<PostgresConnectionManager>;
 pub type PostgresConnection = PooledConnection<PostgresConnectionManager>;
 
-pub struct DB;
-impl Key for DB {
-    type Value = PostgresPool;
-}
-
 pub fn setup_connection_pool(cn_str: &str, pool_size: u32) -> Result<PostgresPool, Box<Error>> {
-    let config = Config::builder().pool_size(pool_size).build();
-    let manager = try!(PostgresConnectionManager::new(cn_str, TlsMode::None));
-    let pool = try!(Pool::new(config, manager));
+    let manager = PostgresConnectionManager::new(cn_str, TlsMode::None)?;
+    let pool = Pool::builder().max_size(pool_size).build(manager)?;
     Ok(pool)
 }
 
-pub fn get_connection(req: &mut Request) -> Result<PostgresConnection, Box<Error>> {
-    let pool = try!(req.get::<Read<DB>>());
-    let conn = try!(pool.get());
-    Ok(conn)
+#[derive(Debug)]
+pub struct DbExecutor(pub PostgresPool);
+
+impl Actor for DbExecutor {
+    type Context = SyncContext<Self>;
+}
+
+impl Handler<messages::GetSources> for DbExecutor {
+    type Result = Result<Sources, io::Error>;
+
+    fn handle(&mut self, _msg: messages::GetSources, _: &mut Self::Context) -> Self::Result {
+        let conn = self.0.get().unwrap();
+        let sources = get_sources(conn)?;
+        Ok(sources)
+    }
+}
+
+impl Handler<messages::GetTile> for DbExecutor {
+    type Result = Result<Tile, io::Error>;
+
+    fn handle(&mut self, msg: messages::GetTile, _: &mut Self::Context) -> Self::Result {
+        let conn = self.0.get().unwrap();
+
+        let tile = msg.source
+            .get_tile(conn, msg.z, msg.x, msg.y, msg.condition)?;
+
+        Ok(tile)
+    }
 }