hakowork/rojo
3
0
Fork 0
mirror of https://github.com/rojo-rbx/rojo.git synced 2026-10-21 03:36:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Major Subsystem Rewrite (Reconciler Mk5) (#217)

Browse source
This commit is contained in:
Lucien Greathouse 2019-08-27 15:00:37 -07:00 • committed by GitHub
parent 8e8291a0bd
commit fea303ac8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
80 changed files with 3843 additions and 5609 deletions
Download patch file Download diff file Expand all files Collapse all files

22
server/src/web/mod.rs
View file

@ -1,6 +1,4 @@
// TODO: This module needs to be public for visualize, we should move
// PublicInstanceMetadata and switch this private!
pub mod api;
mod api;
mod interface;
use std::sync::Arc;
@ -18,9 +16,7 @@ use hyper::{
Server,
};
use crate::{
live_session::LiveSession,
};
use crate::serve_session::ServeSession;
use self::{
api::ApiService,
@ -50,22 +46,22 @@ impl Service for RootService {
}
impl RootService {
pub fn new(live_session: Arc<LiveSession>) -> RootService {
pub fn new(serve_session: Arc<ServeSession>) -> RootService {
RootService {
api: ApiService::new(Arc::clone(&live_session)),
interface: InterfaceService::new(Arc::clone(&live_session)),
api: ApiService::new(Arc::clone(&serve_session)),
interface: InterfaceService::new(Arc::clone(&serve_session)),
}
}
}
pub struct LiveServer {
live_session: Arc<LiveSession>,
serve_session: Arc<ServeSession>,
}
impl LiveServer {
pub fn new(live_session: Arc<LiveSession>) -> LiveServer {
pub fn new(serve_session: Arc<ServeSession>) -> LiveServer {
LiveServer {
live_session,
serve_session,
}
}
@ -75,7 +71,7 @@ impl LiveServer {
let server = Server::bind(&address)
.serve(move || {
let service: FutureResult<_, hyper::Error> =
future::ok(RootService::new(Arc::clone(&self.live_session)));
future::ok(RootService::new(Arc::clone(&self.serve_session)));
service
})
.map_err(|e| eprintln!("Server error: {}", e));