mirror of
https://github.com/mCaptcha/mCaptcha.git
synced 2026-02-12 10:35:39 +00:00
Deploying to gh-pages from @ 2b10aa5d40 🚀
This commit is contained in:
@@ -281,7 +281,7 @@
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">Server</span> {
|
||||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">tarpaulin_include</span>))]</span>
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">get_ip</span>(<span class="kw-2">&</span><span class="self">self</span>) <span class="op">-</span><span class="op">></span> <span class="ident">String</span> {
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">get_ip</span>(<span class="kw-2">&</span><span class="self">self</span>) -> <span class="ident">String</span> {
|
||||
<span class="macro">format!</span>(<span class="string">"{}:{}"</span>, <span class="self">self</span>.<span class="ident">ip</span>, <span class="self">self</span>.<span class="ident">port</span>)
|
||||
}
|
||||
}
|
||||
@@ -298,7 +298,7 @@
|
||||
|
||||
<span class="kw">impl</span> <span class="ident">DatabaseBuilder</span> {
|
||||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">tarpaulin_include</span>))]</span>
|
||||
<span class="kw">fn</span> <span class="ident">extract_database_url</span>(<span class="ident">url</span>: <span class="kw-2">&</span><span class="ident">Url</span>) <span class="op">-</span><span class="op">></span> <span class="self">Self</span> {
|
||||
<span class="kw">fn</span> <span class="ident">extract_database_url</span>(<span class="ident">url</span>: <span class="kw-2">&</span><span class="ident">Url</span>) -> <span class="self">Self</span> {
|
||||
<span class="macro">debug!</span>(<span class="string">"Databse name: {}"</span>, <span class="ident">url</span>.<span class="ident">path</span>());
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">path</span> <span class="op">=</span> <span class="ident">url</span>.<span class="ident">path</span>().<span class="ident">split</span>(<span class="string">'/'</span>);
|
||||
<span class="ident">path</span>.<span class="ident">next</span>();
|
||||
@@ -342,7 +342,7 @@
|
||||
|
||||
<span class="attribute">#[<span class="ident">cfg</span>(<span class="ident">not</span>(<span class="ident">tarpaulin_include</span>))]</span>
|
||||
<span class="kw">impl</span> <span class="ident">Settings</span> {
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">new</span>() <span class="op">-</span><span class="op">></span> <span class="prelude-ty">Result</span><span class="op"><</span><span class="self">Self</span>, <span class="ident">ConfigError</span><span class="op">></span> {
|
||||
<span class="kw">pub</span> <span class="kw">fn</span> <span class="ident">new</span>() -> <span class="prelude-ty">Result</span><span class="op"><</span><span class="self">Self</span>, <span class="ident">ConfigError</span><span class="op">></span> {
|
||||
<span class="kw">let</span> <span class="kw-2">mut</span> <span class="ident">s</span> <span class="op">=</span> <span class="ident">Config::new</span>();
|
||||
|
||||
<span class="comment">// setting default values</span>
|
||||
@@ -369,26 +369,26 @@
|
||||
<span class="ident">check_url</span>(<span class="kw-2">&</span><span class="ident">s</span>);
|
||||
|
||||
<span class="kw">match</span> <span class="ident">env::var</span>(<span class="string">"PORT"</span>) {
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">val</span>) <span class="op">=</span><span class="op">></span> {
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">val</span>) => {
|
||||
<span class="ident">s</span>.<span class="ident">set</span>(<span class="string">"server.port"</span>, <span class="ident">val</span>).<span class="ident">unwrap</span>();
|
||||
}
|
||||
<span class="prelude-val">Err</span>(<span class="ident">e</span>) <span class="op">=</span><span class="op">></span> <span class="macro">warn!</span>(<span class="string">"couldn't interpret PORT: {}"</span>, <span class="ident">e</span>),
|
||||
<span class="prelude-val">Err</span>(<span class="ident">e</span>) => <span class="macro">warn!</span>(<span class="string">"couldn't interpret PORT: {}"</span>, <span class="ident">e</span>),
|
||||
}
|
||||
|
||||
<span class="kw">match</span> <span class="ident">env::var</span>(<span class="string">"DATABASE_URL"</span>) {
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">val</span>) <span class="op">=</span><span class="op">></span> {
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">val</span>) => {
|
||||
<span class="kw">let</span> <span class="ident">url</span> <span class="op">=</span> <span class="ident">Url::parse</span>(<span class="kw-2">&</span><span class="ident">val</span>).<span class="ident">expect</span>(<span class="string">"couldn't parse Database URL"</span>);
|
||||
<span class="kw">let</span> <span class="ident">database_conf</span> <span class="op">=</span> <span class="ident">DatabaseBuilder::extract_database_url</span>(<span class="kw-2">&</span><span class="ident">url</span>);
|
||||
<span class="ident">set_from_database_url</span>(<span class="kw-2">&</span><span class="kw-2">mut</span> <span class="ident">s</span>, <span class="kw-2">&</span><span class="ident">database_conf</span>);
|
||||
}
|
||||
<span class="prelude-val">Err</span>(<span class="ident">e</span>) <span class="op">=</span><span class="op">></span> <span class="macro">warn!</span>(<span class="string">"couldn't interpret DATABASE_URL: {}"</span>, <span class="ident">e</span>),
|
||||
<span class="prelude-val">Err</span>(<span class="ident">e</span>) => <span class="macro">warn!</span>(<span class="string">"couldn't interpret DATABASE_URL: {}"</span>, <span class="ident">e</span>),
|
||||
}
|
||||
|
||||
<span class="ident">set_database_url</span>(<span class="kw-2">&</span><span class="kw-2">mut</span> <span class="ident">s</span>);
|
||||
|
||||
<span class="kw">match</span> <span class="ident">s</span>.<span class="ident">try_into</span>() {
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">val</span>) <span class="op">=</span><span class="op">></span> <span class="prelude-val">Ok</span>(<span class="ident">val</span>),
|
||||
<span class="prelude-val">Err</span>(<span class="ident">e</span>) <span class="op">=</span><span class="op">></span> <span class="prelude-val">Err</span>(<span class="ident">ConfigError::Message</span>(<span class="macro">format!</span>(<span class="string">"\n\nError: {}. If it says missing fields, then please refer to https://github.com/mCaptcha/mcaptcha#configuration to learn more about how mcaptcha reads configuration\n\n"</span>, <span class="ident">e</span>))),
|
||||
<span class="prelude-val">Ok</span>(<span class="ident">val</span>) => <span class="prelude-val">Ok</span>(<span class="ident">val</span>),
|
||||
<span class="prelude-val">Err</span>(<span class="ident">e</span>) => <span class="prelude-val">Err</span>(<span class="ident">ConfigError::Message</span>(<span class="macro">format!</span>(<span class="string">"\n\nError: {}. If it says missing fields, then please refer to https://github.com/mCaptcha/mcaptcha#configuration to learn more about how mcaptcha reads configuration\n\n"</span>, <span class="ident">e</span>))),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user