fix start function

fluentci-io · Jul 13, 2024 · db2fc61 · db2fc61
1 parent 5e9cf97
commit db2fc61
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 9 deletions.
diff --git a/caddy/src/lib.rs b/caddy/src/lib.rs
@@ -20,7 +20,9 @@ pub fn start(_args: String) -> FnResult<String> {
         .with_exec(vec!["caddy", "--version"])?
         .with_exec(vec!["type", "overmind"])?
         .with_exec(vec!["type", "caddy"])?
-        .with_exec(vec!["overmind", "start", "-f", "Procfile", "--daemonize"])?
+        .with_exec(vec![
+            "overmind start -f Procfile --daemonize || flox activate -- overmind restart caddy",
+        ])?
         .wait_on(port.parse()?, None)?
         .with_exec(vec!["overmind", "status"])?
         .with_exec(vec!["curl", "-s", "http://localhost:$CADDY_PORT"])?

diff --git a/dragonflydb/src/lib.rs b/dragonflydb/src/lib.rs
@@ -12,7 +12,7 @@ pub fn start(_args: String) -> FnResult<String> {
         .with_workdir(".fluentci")?
         .with_exec(vec!["overmind", "--version"])?
         .with_exec(vec!["type", "overmind"])?
-        .with_exec(vec!["overmind", "start", "-f", "Procfile", "--daemonize"])?
+        .with_exec(vec!["overmind start -f Procfile --daemonize || flox activate -- overmind restart dragonflydb"])?
         .wait_on(port.parse()?, None)?
         .with_exec(vec!["overmind", "status"])?
         .stdout()?;

diff --git a/httpbin/src/lib.rs b/httpbin/src/lib.rs
@@ -16,7 +16,9 @@ pub fn start(_args: String) -> FnResult<String> {
         .with_exec(vec!["gunicorn", "--version"])?
         .with_exec(vec!["type", "overmind"])?
         .with_exec(vec!["type", "gunicorn"])?
-        .with_exec(vec!["overmind", "start", "-f", "Procfile", "--daemonize"])?
+        .with_exec(vec![
+            "overmind start -f Procfile --daemonize || flox activate -- overmind restart httpbin",
+        ])?
         .wait_on(port.parse()?, None)?
         .with_exec(vec!["overmind", "status"])?
         .with_exec(vec!["curl", "-s", "http://localhost:$HTTPBIN_PORT"])?

diff --git a/mariadb/src/lib.rs b/mariadb/src/lib.rs
@@ -15,7 +15,9 @@ pub fn start(_args: String) -> FnResult<String> {
         .with_exec(vec!["type", "overmind"])?
         .with_exec(vec!["type", "mysql"])?
         .with_exec(vec!["echo -e \"MySQL starting on port $MYSQL_PORT\""])?
-        .with_exec(vec!["overmind", "start", "-f", "Procfile", "--daemonize"])?
+        .with_exec(vec![
+            "overmind start -f Procfile --daemonize || flox activate -- overmind restart mariadb",
+        ])?
         .wait_on(port.parse()?, None)?
         .with_exec(vec!["cat", "$MYSQL_HOME/mysql.log"])?
         .with_exec(vec!["overmind", "status"])?

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

diff --git a/nginx/src/lib.rs b/nginx/src/lib.rs
@@ -17,7 +17,7 @@ pub fn start(_args: String) -> FnResult<String> {
         .with_exec(vec![
             "echo -e \"Nginx starting on port $NGINX_WEB_PORT\\n http://localhost:$NGINX_WEB_PORT\"",
         ])?
-        .with_exec(vec!["overmind", "start", "-f", "Procfile", "--daemonize"])?
+        .with_exec(vec!["overmind start -f Procfile --daemonize || flox activate -- overmind restart nginx"])?
         .wait_on(port.parse()?, None)?
         .with_exec(vec!["overmind", "status"])?
         .with_exec(vec!["curl", "-s", "http://localhost:$NGINX_WEB_PORT"])?

diff --git a/php/src/lib.rs b/php/src/lib.rs
@@ -19,7 +19,7 @@ pub fn start(_args: String) -> FnResult<String> {
         .with_exec(vec!["type", "overmind"])?
         .with_exec(vec!["type", "php"])?
         .with_exec(vec!["type", "php-fpm"])?
-        .with_exec(vec!["overmind", "start", "-f", "Procfile", "--daemonize"])?
+        .with_exec(vec!["overmind start -f Procfile --daemonize || || flox activate -- overmind restart php-fpm"])?
         .with_exec(vec!["sleep", "2"])?
         .with_exec(vec!["overmind", "status"])?
         .wait_on(port.parse()?, None)?

diff --git a/postgres/src/lib.rs b/postgres/src/lib.rs
@@ -15,7 +15,9 @@ pub fn start(_args: String) -> FnResult<String> {
         .with_exec(vec!["type", "overmind"])?
         .with_exec(vec!["type", "postgres"])?
         .with_exec(vec!["echo -e \"Postgres starting on port $PGPORT\""])?
-        .with_exec(vec!["overmind", "start", "-f", "Procfile", "--daemonize"])?
+        .with_exec(vec![
+            "overmind start -f Procfile --daemonize || flox activate -- overmind restart postgres",
+        ])?
         .wait_on(port.parse()?, None)?
         .with_exec(vec!["overmind", "status"])?
         .stdout()?;

diff --git a/redis/src/lib.rs b/redis/src/lib.rs
@@ -13,7 +13,9 @@ pub fn start(_args: String) -> FnResult<String> {
         .with_exec(vec!["redis-server", "--version"])?
         .with_exec(vec!["type", "overmind"])?
         .with_exec(vec!["type", "redis-server"])?
-        .with_exec(vec!["overmind", "start", "-f", "Procfile", "--daemonize"])?
+        .with_exec(vec![
+            "overmind start -f Procfile --daemonize || flox activate -- overmind restart redis",
+        ])?
         .with_exec(vec!["overmind", "status"])?
         .stdout()?;
     Ok(stdout)