Function mcaptcha::api::v1::meta::services [−][src]
pub fn services(cfg: &mut ServiceConfig)
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 @@
pub fn services(cfg: &mut ServiceConfig)
pub fn services(cfg: &mut ServiceConfig)
| routes |
| BuildDetails | |
| BuildDetailsBuilder | Builder for |
| 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())
}
|