fix(mysql): specify socket path

fix(mysql): specify socket path [mysql] log errors fix(mysql): add --datadir param fix(mysql): detect empty data dir
fluentci-io · Jul 12, 2024 · e45181a · e45181a
1 parent 0839a0f
commit e45181a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/mysql/src/helpers.rs b/mysql/src/helpers.rs
@@ -47,9 +47,9 @@ pub fn setup() -> Result<String, Error> {
             "flox", "install", "mysql84", "overmind", "tmux"
         ])?
         .with_exec(vec!["[ -d $MYSQL_DATADIR ] || mkdir -p $MYSQL_DATADIR"])?
-        .with_exec(vec!["[ -z \"$(ls -A $MYSQL_DATADIR)\" ] && flox activate -- mysqld --initialize-insecure --datadir=$MYSQL_DATADIR --basedir=$MYSQL_HOME --log-error=$MYSQL_HOME/mysql.log"])?
+        .with_exec(vec!["[ -f $MYSQL_DATADIR/ca.pem ] && flox activate -- mysqld --initialize-insecure --datadir=$MYSQL_DATADIR --log-error=$MYSQL_HOME/mysql.log"])?
         .with_exec(vec![
-            "grep -q mysql Procfile || echo 'mysql: mysqld --log-error=$MYSQL_HOME/mysql.log --port=$MYSQL_PORT' >> Procfile",
+            "grep -q mysql Procfile || echo 'mysql: mysqld --datadir=$MYSQL_DATADIR --log-error=$MYSQL_HOME/mysql.log --port=$MYSQL_PORT --socket=$MYSQL_HOME/mysql.socket' >> Procfile",
         ])?
         .stdout()?;
 

diff --git a/mysql/src/lib.rs b/mysql/src/lib.rs
@@ -17,6 +17,7 @@ pub fn start(_args: String) -> FnResult<String> {
         .with_exec(vec!["echo -e \"MySQL starting on port $MYSQL_PORT\""])?
         .with_exec(vec!["overmind", "start", "-f", "Procfile", "--daemonize"])?
         .with_exec(vec!["sleep", "2"])?
+        .with_exec(vec!["cat", "$MYSQL_HOME/mysql.log"])?
         .with_exec(vec!["overmind", "status"])?
         .wait_on(port.parse()?, None)?
         .stdout()?;