diff --git a/.github/workflows/test_linux.yml b/.github/workflows/test_linux.yml index 98b5adc..679160d 100644 --- a/.github/workflows/test_linux.yml +++ b/.github/workflows/test_linux.yml @@ -1,4 +1,4 @@ -name: Linux Tests +name: MariaDB on Linux on: [push,pull_request] diff --git a/.github/workflows/test_macos.yml b/.github/workflows/test_macos.yml index d59bdf0..e1c6a35 100644 --- a/.github/workflows/test_macos.yml +++ b/.github/workflows/test_macos.yml @@ -1,4 +1,4 @@ -name: Setup PostgreSQL on macOS without Admin +name: PostgreSQL on MacOS (no root) on: [push] diff --git a/.github/workflows/test_postgresql_OS.yml b/.github/workflows/test_postgresql_OS.yml index 029af0b..ad96420 100644 --- a/.github/workflows/test_postgresql_OS.yml +++ b/.github/workflows/test_postgresql_OS.yml @@ -1,4 +1,4 @@ -name: Setup PostgreSQL on Multiple OS +name: PostgreSQL on Multiple OS (no root) on: [push] diff --git a/.github/workflows/test_windows.yml b/.github/workflows/test_windows.yml index b08b7ac..cf2abee 100644 --- a/.github/workflows/test_windows.yml +++ b/.github/workflows/test_windows.yml @@ -1,4 +1,4 @@ -name: Windows Tests +name: MariaDB on Windows on: [push,pull_request] diff --git a/README.md b/README.md index 61e2526..8b74d0a 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,8 @@ This is a Python-based command-line interface (CLI) tool for managing a portable MariaDB server for MSNoise. The tool allows you to download, extract, install, start, stop, create, and drop databases using MariaDB. -[![Github Action Status](https://github.com/ROBelgium/msnoise-db/actions/workflows/test_linux.yml/badge.svg)](https://github.com/ROBelgium/msnoise-db/actions) - [![Github Action Status](https://github.com/ROBelgium/msnoise-db/actions/workflows/test_windows.yml/badge.svg)](https://github.com/ROBelgium/msnoise-db/actions) - [![Github Action Status](https://github.com/ROBelgium/msnoise-db/actions/workflows/test_macos.yml/badge.svg)](https://github.com/ROBelgium/msnoise-db/actions) +[![Github Action Status](https://github.com/ROBelgium/msnoise-db/actions/workflows/test_linux.yml/badge.svg)](https://github.com/ROBelgium/msnoise-db/actions) [![Github Action Status](https://github.com/ROBelgium/msnoise-db/actions/workflows/test_windows.yml/badge.svg)](https://github.com/ROBelgium/msnoise-db/actions) [![Github Action Status](https://github.com/ROBelgium/msnoise-db/actions/workflows/test_macos.yml/badge.svg)](https://github.com/ROBelgium/msnoise-db/actions) [![Github Action Status](https://github.com/ROBelgium/msnoise-db/actions/workflows/test_postgresql_OS.yml/badge.svg)](https://github.com/ROBelgium/msnoise-db/actions) + ## Features diff --git a/msnoise_db/cli.py b/msnoise_db/cli.py index 66da0aa..677d855 100644 --- a/msnoise_db/cli.py +++ b/msnoise_db/cli.py @@ -148,13 +148,6 @@ def start_server(): mysqld_cmd = os.path.join(bin_dir, "mariadbd-safe") process = subprocess.Popen([mysqld_cmd, '--defaults-file='+ CONFIG_FILE], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL, preexec_fn=os.setpgrp) - # os.system(mysqld_cmd + " --defaults-file="+CONFIG_FILE+ "&") - if process.returncode: - print(process.stdout.read()) - print(process.stderr.read()) - sys.exit(0) - logdir = os.path.join(mariadb_dir, "log") - print(open(os.path.join(logdir, "err.log"), "r").read()) # Loop until MariaDB service is active # while not is_mariadbd_active():