Merge pull request #110 from spaceapi-community/update-dependencies

Update dependencies

Author: rnestler

CHANGELOG.md

@@ -11,6 +11,10 @@ Possible log types:
 - `[fixed]` for any bug fixes.
 - `[security]` to invite users to upgrade in case of vulnerabilities.
 
+### Unreleased
+
+- [changed] Update redis to 0.21 and remove r2d2\_redis (#110)
+
 ### v0.6.0  (2021-08-30)
 
 - [changed] Update redis to 0.20 and r2d2\_redis to 0.14 (#105, #106)

Cargo.toml

@@ -24,9 +24,8 @@ include = [
 edition = "2018"
 
 [dependencies]
-r2d2 = "^0.8.5"
-r2d2_redis = "^0.14.0"
-redis = "^0.20.0"
+r2d2 = "^0.8.7"
+redis = { version = "^0.21.1", features = ['r2d2'] }
 log = "^0.4"
 iron = "^0.6.1"
 urlencoded = "^0.6"
@@ -38,4 +37,4 @@ quick-error = "2.0"
 
 
 [dev-dependencies]
-env_logger = "^0.8.3"
+env_logger = "^0.9.0"

examples/with_custom_redis_pool.rs

@@ -1,6 +1,5 @@
 extern crate env_logger;
 extern crate r2d2;
-extern crate r2d2_redis;
 extern crate redis;
 extern crate spaceapi_server;
 
@@ -9,10 +8,9 @@ use spaceapi_server::modifiers::StatusModifier;
 use spaceapi_server::SpaceapiServerBuilder;
 
 use r2d2::Pool;
-use r2d2_redis::RedisConnectionManager;
 use redis::{Commands, RedisResult};
 
-type RedisPool = Pool<RedisConnectionManager>;
+type RedisPool = Pool<redis::Client>;
 
 struct OpenStatusFromRedisModifier {
     pool: RedisPool,
@@ -67,8 +65,15 @@ fn main() {
         .build()
         .expect("Creating status failed");
 
-    let manager = r2d2_redis::RedisConnectionManager::new("redis://localhost").unwrap();
-    let pool = r2d2::Pool::builder().build(manager).unwrap();
+    // get redis client
+    let client: redis::Client = redis::Client::open("redis://127.0.0.1/")
+        .unwrap_or_else(|e| panic!("Error connecting to redis: {}", e));
+
+    // create r2d2 pool
+    let pool: r2d2::Pool<redis::Client> = r2d2::Pool::builder()
+        .max_size(15)
+        .build(client)
+        .unwrap_or_else(|e| panic!("Error building redis pool: {}", e));
 
     // Set up server
     let server = SpaceapiServerBuilder::new(status)

src/server/mod.rs

@@ -6,7 +6,6 @@ use std::time::Duration;
 
 use iron::Iron;
 use log::debug;
-use r2d2_redis::RedisConnectionManager;
 use redis::{ConnectionInfo, IntoConnectionInfo};
 use router::Router;
 
@@ -24,7 +23,7 @@ use crate::types::RedisPool;
 
 enum RedisInfo {
     None,
-    Pool(r2d2::Pool<r2d2_redis::RedisConnectionManager>),
+    Pool(r2d2::Pool<redis::Client>),
     ConnectionInfo(ConnectionInfo),
     Err(SpaceapiServerError),
 }
@@ -86,7 +85,7 @@ impl SpaceapiServerBuilder {
     /// See
     /// [`examples/with_custom_redis_pool.rs`](https://github.com/spaceapi-community/spaceapi-server-rs/blob/master/examples/with_custom_redis_pool.rs)
     /// for a real example.
-    pub fn redis_pool(mut self, redis_pool: r2d2::Pool<r2d2_redis::RedisConnectionManager>) -> Self {
+    pub fn redis_pool(mut self, redis_pool: r2d2::Pool<redis::Client>) -> Self {
         self.redis_info = RedisInfo::Pool(redis_pool);
         self
     }
@@ -125,12 +124,11 @@ impl SpaceapiServerBuilder {
             RedisInfo::Pool(p) => Ok(p),
             RedisInfo::ConnectionInfo(ci) => {
                 // Log some useful debug information
-                debug!("Connecting to redis database {} at {:?}", ci.db, ci.addr);
+                debug!("Connecting to redis database {} at {:?}", ci.redis.db, ci.addr);
 
-                let redis_manager = RedisConnectionManager::new(ci)?;
+                let client: redis::Client = redis::Client::open(ci)?;
 
-                // Create redis pool
-                let redis_pool = r2d2::Pool::builder()
+                let redis_pool: r2d2::Pool<redis::Client> = r2d2::Pool::builder()
                     // Provide up to 6 connections in connection pool
                     .max_size(6)
                     // At least 1 connection must be active
@@ -143,7 +141,7 @@ impl SpaceapiServerBuilder {
                     .error_handler(Box::new(r2d2::NopErrorHandler))
                     // Initialize connection pool lazily. This allows the SpaceAPI
                     // server to work even without a database connection.
-                    .build_unchecked(redis_manager);
+                    .build_unchecked(client);
                 Ok(redis_pool)
             }
         };

src/types.rs

@@ -1,5 +1,3 @@
 //! Type definitions.
 
-use r2d2_redis::RedisConnectionManager;
-
-pub type RedisPool = r2d2::Pool<RedisConnectionManager>;
+pub type RedisPool = r2d2::Pool<redis::Client>;