From 0b061358023d4435d2073ac410ef9b5ac3c59ab5 Mon Sep 17 00:00:00 2001 From: realaravinth Date: Sun, 13 Jun 2021 07:33:45 +0000 Subject: [PATCH] =?UTF-8?q?Deploying=20to=20gh-pages=20from=20=20@=2096361?= =?UTF-8?q?806737dcc6bb87f3c78cd3a72ef55ceb449=20=F0=9F=9A=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- mcaptcha/api/v1/meta/fn.services.html | 2 +- mcaptcha/api/v1/meta/index.html | 2 +- src/mcaptcha/api/v1/meta.rs.html | 40 ++++++++++----------------- 3 files changed, 17 insertions(+), 27 deletions(-) diff --git a/mcaptcha/api/v1/meta/fn.services.html b/mcaptcha/api/v1/meta/fn.services.html index 7579587e..6d6eff55 100644 --- a/mcaptcha/api/v1/meta/fn.services.html +++ b/mcaptcha/api/v1/meta/fn.services.html @@ -1,5 +1,5 @@ mcaptcha::api::v1::meta::services - Rust

Function mcaptcha::api::v1::meta::services[−][src]

pub fn services(cfg: &mut ServiceConfig)
+ Change settings

Function mcaptcha::api::v1::meta::services[−][src]

pub fn services(cfg: &mut ServiceConfig)
\ No newline at end of file diff --git a/mcaptcha/api/v1/meta/index.html b/mcaptcha/api/v1/meta/index.html index 214cf3fc..d364cda8 100644 --- a/mcaptcha/api/v1/meta/index.html +++ b/mcaptcha/api/v1/meta/index.html @@ -1,7 +1,7 @@ mcaptcha::api::v1::meta - Rust

Module mcaptcha::api::v1::meta[−][src]

Modules

+ Change settings

Module mcaptcha::api::v1::meta[−][src]

Modules

routes

Structs

BuildDetails
BuildDetailsBuilder

Builder for BuildDetails.

Health

Health check return datatype

diff --git a/src/mcaptcha/api/v1/meta.rs.html b/src/mcaptcha/api/v1/meta.rs.html index 93a445e7..195807c5 100644 --- a/src/mcaptcha/api/v1/meta.rs.html +++ b/src/mcaptcha/api/v1/meta.rs.html @@ -151,11 +151,6 @@ 148 149 150 -151 -152 -153 -154 -155 
 /*
 * Copyright (C) 2021  Aravinth Manivannan <realaravinth@batsense.net>
@@ -176,12 +171,12 @@
 
 use actix_web::{web, HttpResponse, Responder};
 use derive_builder::Builder;
-use serde::{Deserialize, Serialize};
 use libmcaptcha::redis::{Redis, RedisConfig};
+use serde::{Deserialize, Serialize};
 
+use crate::data::SystemGroup;
 use crate::AppData;
 use crate::{GIT_COMMIT_HASH, VERSION};
-use crate::data::SystemGroup;
 
 #[derive(Clone, Debug, Deserialize, Builder, Serialize)]
 pub struct BuildDetails {
@@ -223,7 +218,7 @@
     redis: Option<bool>,
 }
 
-impl  Health {
+impl Health {
     fn is_redis(redis: &Option<bool>) -> bool {
         redis.is_none()
     }
@@ -236,9 +231,7 @@
 
     let mut resp_builder = HealthBuilder::default();
     resp_builder.db(false);
-    if resp_builder.redis.is_none() {
-        //
-    };
+    resp_builder.redis = None;
 
     if let Ok(mut con) = data.db.acquire().await {
         if con.ping().await.is_ok() {
@@ -246,21 +239,18 @@
         }
     };
 
-    match data.captcha {
-        SystemGroup::Redis(_) => {
-            let r = Redis::new(RedisConfig::Single(crate::SETTINGS.redis.as_ref().unwrap().url.clone())).await.unwrap();
-            let  status = r.get_client().ping().await;
+    if let SystemGroup::Redis(_) = data.captcha {
+        if let Ok(r) = Redis::new(RedisConfig::Single(
+            crate::SETTINGS.redis.as_ref().unwrap().url.clone(),
+        ))
+        .await
+        {
+            let status = r.get_client().ping().await;
             resp_builder.redis = Some(Some(status));
-
-
-//            unimplemented!("GET PING FROM REDIS")
-            //redis.get
-
-        },
-        SystemGroup::Embedded(_) => {
-            resp_builder.redis = None;
-        },
-    }
+        } else {
+            resp_builder.redis = Some(Some(false));
+        }
+    };
 
     HttpResponse::Ok().json(resp_builder.build().unwrap())
 }