Deploying to gh-pages from @ d0c5ffb486 🚀

This commit is contained in:
realaravinth
2021-05-12 12:56:18 +00:00
parent 408cb86a68
commit 79f1e2bb0f
23 changed files with 124 additions and 64 deletions

View File

@@ -188,6 +188,21 @@
<span id="185">185</span>
<span id="186">186</span>
<span id="187">187</span>
<span id="188">188</span>
<span id="189">189</span>
<span id="190">190</span>
<span id="191">191</span>
<span id="192">192</span>
<span id="193">193</span>
<span id="194">194</span>
<span id="195">195</span>
<span id="196">196</span>
<span id="197">197</span>
<span id="198">198</span>
<span id="199">199</span>
<span id="200">200</span>
<span id="201">201</span>
<span id="202">202</span>
</pre><div class="example-wrap"><pre class="rust ">
<span class="comment">/*
* Copyright (C) 2021 Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -206,6 +221,7 @@
* along with this program. If not, see &lt;https://www.gnu.org/licenses/&gt;.
*/</span>
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">env</span>;
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">path</span>::<span class="ident">Path</span>;
<span class="kw">use</span> <span class="ident">config</span>::{<span class="ident">Config</span>, <span class="ident">ConfigError</span>, <span class="ident">Environment</span>, <span class="ident">File</span>};
<span class="kw">use</span> <span class="ident">log</span>::<span class="ident">debug</span>;
@@ -288,8 +304,19 @@
<span class="ident">s</span>.<span class="ident">set_default</span>(<span class="string">&quot;database.pool&quot;</span>, <span class="number">2</span>.<span class="ident">to_string</span>())
.<span class="ident">expect</span>(<span class="string">&quot;Couldn&#39;t get the number of CPUs&quot;</span>);
<span class="comment">// merging default config from file</span>
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File</span>::<span class="ident">with_name</span>(<span class="string">&quot;./config/default.toml&quot;</span>))<span class="question-mark">?</span>;
<span class="kw">const</span> <span class="ident">CURRENT_DIR</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;./config/default.toml&quot;</span>;
<span class="kw">const</span> <span class="ident">ETC</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;/etc/guard/config.toml&quot;</span>;
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="ident">path</span>) <span class="op">=</span> <span class="ident">env</span>::<span class="ident">var</span>(<span class="string">&quot;GUARD_CONFIG&quot;</span>) {
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File</span>::<span class="ident">with_name</span>(<span class="kw-2">&amp;</span><span class="ident">path</span>))<span class="question-mark">?</span>;
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">Path</span>::<span class="ident">new</span>(<span class="ident">CURRENT_DIR</span>).<span class="ident">exists</span>() {
<span class="comment">// merging default config from file</span>
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File</span>::<span class="ident">with_name</span>(<span class="ident">CURRENT_DIR</span>))<span class="question-mark">?</span>;
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">Path</span>::<span class="ident">new</span>(<span class="ident">ETC</span>).<span class="ident">exists</span>() {
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File</span>::<span class="ident">with_name</span>(<span class="ident">ETC</span>))<span class="question-mark">?</span>;
} <span class="kw">else</span> {
<span class="ident">log</span>::<span class="macro">warn</span><span class="macro">!</span>(<span class="string">&quot;configuration file not found&quot;</span>);
}
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">Environment</span>::<span class="ident">with_prefix</span>(<span class="string">&quot;GUARD&quot;</span>))<span class="question-mark">?</span>;
@@ -313,7 +340,10 @@
<span class="ident">set_database_url</span>(<span class="kw-2">&amp;</span><span class="kw-2">mut</span> <span class="ident">s</span>);
<span class="ident">s</span>.<span class="ident">try_into</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">&gt;</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">&gt;</span> <span class="prelude-val">Err</span>(<span class="ident">ConfigError</span>::<span class="ident">Message</span>(<span class="macro">format</span><span class="macro">!</span>(<span class="string">&quot;\n\nError: {}. If it says missing fields, then please refer to https://github.com/mCaptcha/guard#configuration to learn more about how guard reads configuration\n\n&quot;</span>, <span class="ident">e</span>)))<span class="question-mark">?</span>,
}
}
}

View File

@@ -188,6 +188,21 @@
<span id="185">185</span>
<span id="186">186</span>
<span id="187">187</span>
<span id="188">188</span>
<span id="189">189</span>
<span id="190">190</span>
<span id="191">191</span>
<span id="192">192</span>
<span id="193">193</span>
<span id="194">194</span>
<span id="195">195</span>
<span id="196">196</span>
<span id="197">197</span>
<span id="198">198</span>
<span id="199">199</span>
<span id="200">200</span>
<span id="201">201</span>
<span id="202">202</span>
</pre><div class="example-wrap"><pre class="rust ">
<span class="comment">/*
* Copyright (C) 2021 Aravinth Manivannan &lt;realaravinth@batsense.net&gt;
@@ -206,6 +221,7 @@
* along with this program. If not, see &lt;https://www.gnu.org/licenses/&gt;.
*/</span>
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">env</span>;
<span class="kw">use</span> <span class="ident">std</span>::<span class="ident">path</span>::<span class="ident">Path</span>;
<span class="kw">use</span> <span class="ident">config</span>::{<span class="ident">Config</span>, <span class="ident">ConfigError</span>, <span class="ident">Environment</span>, <span class="ident">File</span>};
<span class="kw">use</span> <span class="ident">log</span>::<span class="ident">debug</span>;
@@ -288,8 +304,19 @@
<span class="ident">s</span>.<span class="ident">set_default</span>(<span class="string">&quot;database.pool&quot;</span>, <span class="number">2</span>.<span class="ident">to_string</span>())
.<span class="ident">expect</span>(<span class="string">&quot;Couldn&#39;t get the number of CPUs&quot;</span>);
<span class="comment">// merging default config from file</span>
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File</span>::<span class="ident">with_name</span>(<span class="string">&quot;./config/default.toml&quot;</span>))<span class="question-mark">?</span>;
<span class="kw">const</span> <span class="ident">CURRENT_DIR</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;./config/default.toml&quot;</span>;
<span class="kw">const</span> <span class="ident">ETC</span>: <span class="kw-2">&amp;</span><span class="ident">str</span> <span class="op">=</span> <span class="string">&quot;/etc/guard/config.toml&quot;</span>;
<span class="kw">if</span> <span class="kw">let</span> <span class="prelude-val">Ok</span>(<span class="ident">path</span>) <span class="op">=</span> <span class="ident">env</span>::<span class="ident">var</span>(<span class="string">&quot;GUARD_CONFIG&quot;</span>) {
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File</span>::<span class="ident">with_name</span>(<span class="kw-2">&amp;</span><span class="ident">path</span>))<span class="question-mark">?</span>;
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">Path</span>::<span class="ident">new</span>(<span class="ident">CURRENT_DIR</span>).<span class="ident">exists</span>() {
<span class="comment">// merging default config from file</span>
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File</span>::<span class="ident">with_name</span>(<span class="ident">CURRENT_DIR</span>))<span class="question-mark">?</span>;
} <span class="kw">else</span> <span class="kw">if</span> <span class="ident">Path</span>::<span class="ident">new</span>(<span class="ident">ETC</span>).<span class="ident">exists</span>() {
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">File</span>::<span class="ident">with_name</span>(<span class="ident">ETC</span>))<span class="question-mark">?</span>;
} <span class="kw">else</span> {
<span class="ident">log</span>::<span class="macro">warn</span><span class="macro">!</span>(<span class="string">&quot;configuration file not found&quot;</span>);
}
<span class="ident">s</span>.<span class="ident">merge</span>(<span class="ident">Environment</span>::<span class="ident">with_prefix</span>(<span class="string">&quot;GUARD&quot;</span>))<span class="question-mark">?</span>;
@@ -313,7 +340,10 @@
<span class="ident">set_database_url</span>(<span class="kw-2">&amp;</span><span class="kw-2">mut</span> <span class="ident">s</span>);
<span class="ident">s</span>.<span class="ident">try_into</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">&gt;</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">&gt;</span> <span class="prelude-val">Err</span>(<span class="ident">ConfigError</span>::<span class="ident">Message</span>(<span class="macro">format</span><span class="macro">!</span>(<span class="string">&quot;\n\nError: {}. If it says missing fields, then please refer to https://github.com/mCaptcha/guard#configuration to learn more about how guard reads configuration\n\n&quot;</span>, <span class="ident">e</span>)))<span class="question-mark">?</span>,
}
}
}