From 71f1b13d0b33f4c2d9b2bd63f6e4b13b9b9aa53b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Henrik=20tom=20W=C3=B6rden?= <henrik@trineo.org>
Date: Wed, 25 Aug 2021 10:33:59 +0200
Subject: [PATCH] MAINT: rename get_env_var to get_env_fallback
---
src/CaosDB.jl | 2 +-
src/Connection.jl | 10 +++++-----
src/Utility.jl | 8 ++++----
test/runtests.jl | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/src/CaosDB.jl b/src/CaosDB.jl
index e42d504..b81fd46 100644
--- a/src/CaosDB.jl
+++ b/src/CaosDB.jl
@@ -29,7 +29,7 @@ export evaluate_return_code,
CaosDBException, ClientException, GenericCaosDBException, CaosDBMessage
# Exports from module Utility
-export get_env_var
+export get_env_fallback
# Export from module Connection
export connect, connect_manually
diff --git a/src/Connection.jl b/src/Connection.jl
index ac29f69..cf106ef 100644
--- a/src/Connection.jl
+++ b/src/Connection.jl
@@ -364,13 +364,13 @@ function connect_manually(;
if host == ""
- host = CaosDB.Utility.get_env_var("CAOSDB_SERVER_HOST", "localhost")
+ host = CaosDB.Utility.get_env_fallback("CAOSDB_SERVER_HOST", "localhost")
end
if port_str == "undefined"
- port_str = CaosDB.Utility.get_env_var("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443")
+ port_str = CaosDB.Utility.get_env_fallback("CAOSDB_SERVER_GRPC_PORT_HTTPS", "8443")
end
@@ -378,19 +378,19 @@ function connect_manually(;
if cacert == ""
- cacert = CaosDB.Utility.get_env_var("CAOSDB_SERVER_CERT")
+ cacert = CaosDB.Utility.get_env_fallback("CAOSDB_SERVER_CERT")
end
if username == ""
- username = CaosDB.Utility.get_env_var("CAOSDB_USER", "admin")
+ username = CaosDB.Utility.get_env_fallback("CAOSDB_USER", "admin")
end
if password == "undefined"
- password = CaosDB.Utility.get_env_var("CAOSDB_PASSWORD", "caosdb")
+ password = CaosDB.Utility.get_env_fallback("CAOSDB_PASSWORD", "caosdb")
end
diff --git a/src/Utility.jl b/src/Utility.jl
index 289d666..4f74dcd 100644
--- a/src/Utility.jl
+++ b/src/Utility.jl
@@ -22,21 +22,21 @@
#
module Utility
-export get_env_var
+export get_env_fallback
using ..CaosDB
"""
- get_env_var(var[, default])
+ get_env_fallback(var[, default])
Return the environmental variable `var` if it exists, `default`
otherwise. If no `default` is given an empty string is returned
instead.
"""
-function get_env_var(var::AbstractString, default::AbstractString = "")
+function get_env_fallback(var::AbstractString, default::AbstractString = "")
ret = ccall(
- (:caosdb_utility_get_env_var, CaosDB.library_name),
+ (:caosdb_utility_get_env_fallback, CaosDB.library_name),
Cstring,
(Cstring, Cstring),
var,
diff --git a/test/runtests.jl b/test/runtests.jl
index ca2eedf..66b08bd 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -30,7 +30,7 @@ using CaosDB
else
shell_var = "default"
end
- @test CaosDB.Utility.get_env_var("SHELL", "default") == shell_var
+ @test CaosDB.Utility.get_env_fallback("SHELL", "default") == shell_var
end
@testset "TestExceptions" begin
--
GitLab