async rwlock

Author: reynoldsbd

src/cameras.rs

@@ -1,20 +1,18 @@
 //! Camera management
 
-use std::sync::RwLock;
-
 use tokio::fs;
+use tokio::sync::RwLock;
 
 use actix_web::HttpResponse;
 use actix_web::http::{StatusCode};
 use actix_web::web::{self, Data, Json, ServiceConfig};
 
 use awc::Client;
 use diesel::prelude::*;
-use log::{debug, info, trace, warn};
+use log::{debug, info, trace};
 use serde::{Deserialize, Serialize};
 use tera::{Context, Tera};
 
-use crate::do_write;
 use crate::db::{ConnectionPool, PooledConnection};
 use crate::db::schema::cameras;
 use crate::error::{Error, Result};
@@ -296,7 +294,9 @@ async fn patch_camera(
             assert!(cfg!(feature = "stream"));
             debug!("updating local stream settings");
             #[cfg(feature = "stream")]
-            do_write!(stream).update(&new_stream, &conn, &templates)
+            stream.write()
+                .await
+                .update(&new_stream, &conn, &templates)
                 .await?;
         } else {
             debug!("sending new stream settings to {}", camera.address);

src/main.rs

@@ -20,14 +20,14 @@ mod users;
 
 use std::env;
 use std::mem;
-use std::sync::RwLock;
 
 use actix_files::Files;
 use actix_web::{App, HttpServer};
 use actix_web::web::{self, Data};
 use env_logger::Env;
 use log::{debug, trace};
 use tera::Tera;
+use tokio::sync::RwLock;
 
 use crate::error::Result;
 

src/stream.rs

@@ -9,7 +9,6 @@ use std::env;
 use std::fs;
 use std::io::Write;
 use std::process::{Command, Stdio};
-use std::sync::RwLock;
 
 use actix_web::web::{self, Data, Json, ServiceConfig};
 use diesel::backend::Backend;
@@ -20,8 +19,8 @@ use log::{debug, trace};
 use rand::Rng;
 use serde::{Deserialize, Serialize};
 use tera::{Context, Tera};
+use tokio::sync::RwLock;
 
-use crate::{do_read, do_write};
 use crate::error::Result;
 use crate::db::{ConnectionPool, PooledConnection};
 use crate::prochost::ProcHost;
@@ -310,9 +309,11 @@ async fn get_stream(
     stream: Data<RwLock<Stream>>,
 ) -> Result<Json<StreamState>> {
 
-    let stream = do_read!(stream);
+    let state = stream.read()
+        .await
+        .state();
 
-    Ok(Json(stream.state()))
+    Ok(Json(state))
 }
 
 
@@ -324,9 +325,10 @@ async fn patch_stream(
     body: Json<StreamUpdate>,
 ) -> Result<Json<StreamState>> {
 
-    let mut stream = do_write!(stream);
     let conn = pool.get()?;
 
+    let mut stream = stream.write()
+        .await;
     stream.update(&body, &conn, &templates)
         .await?;