robin/haze
1
0
Fork 0
mirror of https://codeberg.org/icewind/haze.git synced 2026-06-03 09:04:12 +02:00
Code Issues Projects Releases Wiki Activity

wait mysql

Browse source
This commit is contained in:
Robin Appelman 2021-03-14 18:10:00 +01:00
commit a3bb24d0d9
2 changed files with 16 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
images/haze/misc/install
View file

@ -13,6 +13,8 @@ cd $WEBROOT
if [ "$SQL" = "oci" ]; then if [ "$SQL" = "oci" ]; then
# oracle is a special snowflake # oracle is a special snowflake
occ maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database=$SQL --database-name=xe --database-host=$SQL --database-user=system --database-pass=oracle occ maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database=$SQL --database-name=xe --database-host=$SQL --database-user=system --database-pass=oracle
elif [ "$SQL" = "mariadb" ]; then
occ maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database=mysql --database-name=haze --database-host=$SQL --database-user=haze --database-pass=haze
else else
occ maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database=$SQL --database-name=haze --database-host=$SQL --database-user=haze --database-pass=haze occ maintenance:install --admin-user=$USER --admin-pass=$PASSWORD --database=$SQL --database-name=haze --database-host=$SQL --database-user=haze --database-pass=haze
fi; fi;

16
src/database.rs
View file

@ -250,8 +250,20 @@ impl Database {
async fn is_healthy(&self, docker: &mut Docker, cloud_id: &str) -> Result<bool> { async fn is_healthy(&self, docker: &mut Docker, cloud_id: &str) -> Result<bool> {
match self.family() { match self.family() {
DatabaseFamily::Sqlite => Ok(true), DatabaseFamily::Sqlite => Ok(true),
DatabaseFamily::Mysql => Ok(true), DatabaseFamily::Mysql | DatabaseFamily::MariaDB => {
DatabaseFamily::MariaDB => Ok(true), let mut output = Vec::new();
exec(
docker,
format!("{}-db", cloud_id),
"root",
vec!["mysql", "-u", "haze", "-phaze", "-e", "SELECT 1"],
vec![],
Some(&mut output),
)
.await?;
let output = String::from_utf8(output)?;
Ok(!output.contains("ERROR"))
}
DatabaseFamily::Postgres => { DatabaseFamily::Postgres => {
let is_ready_status = exec( let is_ready_status = exec(
docker, docker,