This commit is contained in:
einhorn_b 2021-05-24 12:20:04 +02:00
parent 20d911a6d3
commit ba42a04f79
2 changed files with 11 additions and 18 deletions

View File

@ -275,10 +275,6 @@ jobs:
runs-on: ubuntu-latest
needs: [build_test_community_server]
services:
nginx:
image: gradido/nginx:latest
ports:
- 80:80
mariadb:
image: gradido/mariadb:test
env:
@ -288,13 +284,6 @@ jobs:
- 3306:3306
volumes:
- db_vol:/var/lib/mysql
login-server:
image: gradido/login_server:latest
ports:
- 1200:1200
- 1201:1201
volumes:
- ~/configs/login_server:/etc/grd_login
steps:
##########################################################################
# CHECKOUT CODE ##########################################################

View File

@ -38,31 +38,35 @@ void runMysql(std::string sqlQuery)
int load() {
// init server config, init seed array
std::clog << "[Gradido_LoginServer_Test::load]" << std::endl;
std::clog << "[load]" << std::endl;
Poco::AutoPtr<Poco::Util::LayeredConfiguration> test_config(new Poco::Util::LayeredConfiguration);
try {
auto cfg = new Poco::Util::PropertyFileConfiguration("Gradido_LoginServer_Test.properties");
std::clog << "[Gradido_LoginServer_Test::load] add config start" << std::endl;
std::clog << "[load] add config start" << std::endl;
test_config->add(cfg);
std::clog << "[Gradido_LoginServer_Test::load] after add config" << std::endl;
std::clog << "[load] after add config" << std::endl;
}
catch (Poco::Exception& ex) {
printf("[load] error loading Gradido_LoginServer_Test.properties, make sure this file exist! (%s)\n", ex.displayText().data());
std::clog
<< "[load] error loading Gradido_LoginServer_Test.properties, make sure this file exist! "
<< ex.displayText().data()
<< std::endl;
return -3;
}
std::clog << "[Gradido_LoginServer_Test::load] after loading config" << std::endl;
std::clog << "[load] after loading config" << std::endl;
if (!ServerConfig::initServerCrypto(*test_config)) {
//printf("[Gradido_LoginServer::%s] error init server crypto\n", __FUNCTION__);
printf("[load] error init server crypto");
return -1;
}
std::clog << "[Gradido_LoginServer_Test::load] after init server crypto" << std::endl;
std::clog << "[load] after init server crypto" << std::endl;
if (!ServerConfig::loadMnemonicWordLists()) {
printf("[load] error in loadMnemonicWordLists");
return -2;
}
std::clog << "[Gradido_LoginServer_Test::load] after load mnemonic word lists" << std::endl;
std::clog << "[load] after load mnemonic word lists" << std::endl;
// start cpu scheduler
uint8_t worker_count = Poco::Environment::processorCount();