From f8e22fc7fc1d17398b921d05c48e1af8642de82c Mon Sep 17 00:00:00 2001
From: Daniel Neto <me@danielneto.com>
Date: Tue, 11 Jun 2024 14:07:39 -0300
Subject: [PATCH] Update

---
 deploy/apache/docker-entrypoint    |  2 +-
 plugin/YPTSocket/YPTSocket.php     | 14 +++++++++++---
 plugin/YPTSocket/footer.php        |  2 +-
 plugin/YPTSocket/functions.php     |  2 +-
 plugin/YPTSocket/serverCertbot.php |  2 +-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/deploy/apache/docker-entrypoint b/deploy/apache/docker-entrypoint
index b59ffabac6..644a7a639f 100644
--- a/deploy/apache/docker-entrypoint
+++ b/deploy/apache/docker-entrypoint
@@ -117,7 +117,7 @@ echo "entrypoint -- Writing /var/www/docker_vars.json"
 echo "{\"SOCKET_PORT\":${SOCKET_PORT}, \"HTTP_PORT\":${HTTP_PORT}, \"HTTPS_PORT\":${HTTPS_PORT}, \"SERVER_NAME\":\"${SERVER_NAME}\", \"NGINX_RTMP_PORT\":${NGINX_RTMP_PORT}, \"NGINX_HTTP_PORT\":${NGINX_HTTP_PORT}, \"NGINX_HTTPS_PORT\":${NGINX_HTTPS_PORT}}" > /var/www/docker_vars.json
 
 echo "entrypoint -- Starting socket server..."
-ulimit -n 1048576 && nohup php /var/www/html/AVideo/plugin/YPTSocket/server.php &
+nohup php /var/www/html/AVideo/plugin/YPTSocket/server.php &
 
 
 echo "Clear cache"
diff --git a/plugin/YPTSocket/YPTSocket.php b/plugin/YPTSocket/YPTSocket.php
index 37a25fda17..9d74573a77 100644
--- a/plugin/YPTSocket/YPTSocket.php
+++ b/plugin/YPTSocket/YPTSocket.php
@@ -20,9 +20,9 @@ class YPTSocket extends PluginAbstract
         global $global;
         $desc = '<span class="socket_info" style="float: right; margin:0 10px;">' . getSocketConnectionLabel() . '</span><script>if(isSocketActive()){setSocketIconStatus(\'connected\');}</script> ';
         $desc .= "Socket Plugin, WebSockets allow for a higher amount of efficiency compared to REST because they do not require the HTTP request/response overhead for each message sent and received<br>";
-        $desc .= "<br>To start it on server now <code>ulimit -n 1048576 &&  sudo nohup php {$global['systemRootPath']}plugin/YPTSocket/server.php &</code>";
+        $desc .= "<br>To start it on server now <code>sudo ".YPTSocket::getStartServerCommand()."</code>";
         $desc .= "<br>To test use <code>php {$global['systemRootPath']}plugin/YPTSocket/test.php</code>";
-        $desc .= "<br>To start it on server reboot add it on your crontab (Ubuntu 18+) <code>sudo crontab -eu root</code> than add this code on the last line <code>@reboot sleep 60;nohup php {$global['systemRootPath']}plugin/YPTSocket/server.php &</code>";
+        $desc .= "<br>To start it on server reboot add it on your crontab (Ubuntu 18+) <code>sudo crontab -eu root</code> than add this code on the last line <code>@reboot sleep 60;".YPTSocket::getStartServerCommand()."</code>";
         $desc .= "<br>If you use Certbot to renew your SSL use (Ubuntu 18+) <code>sudo crontab -eu root</code> than add this code on the last line <code>0 1 * * * nohup php {$global['systemRootPath']}plugin/YPTSocket/serverCertbot.php &</code>";
         $help = "<br>run this command start the server <small><a href='https://github.com/WWBN/AVideo/wiki/Socket-Plugin' target='_blank'><i class='fas fa-question-circle'></i> Help</a></small>";
 
@@ -324,7 +324,15 @@ class YPTSocket extends PluginAbstract
         global $global;
         exec("php {$global['systemRootPath']}plugin/YPTSocket/stopServer.php");
         exec("sleep 1");
-        execAsync("ulimit -n 1048576 && nohup php {$global['systemRootPath']}plugin/YPTSocket/server.php &");
+        execAsync(YPTSocket::getStartServerCommand());
         return true;
     }
+
+    
+    static public function getStartServerCommand()
+    {
+        global $global;
+        $command = "nohup bash -c 'ulimit -n 1048576 && php {$global['systemRootPath']}plugin/YPTSocket/server.php &'";
+        return $command;
+    }
 }
diff --git a/plugin/YPTSocket/footer.php b/plugin/YPTSocket/footer.php
index 396f4dfefb..c9911301d7 100644
--- a/plugin/YPTSocket/footer.php
+++ b/plugin/YPTSocket/footer.php
@@ -23,7 +23,7 @@ if (!empty($obj->debugAllUsersSocket) || (User::isAdmin() && !empty($obj->debugS
     if (isset($_COOKIE['socketInfoPositionLeft'])) {
         $socket_info_container_left = $_COOKIE['socketInfoPositionLeft'];
     }
-    $command = "sudo ulimit -n 1048576 && sudo nohup php {$global['systemRootPath']}plugin/YPTSocket/server.php &";
+    $command = "sudo ".YPTSocket::getStartServerCommand();
     ?>
     <style>
         #socket_info_container>div{
diff --git a/plugin/YPTSocket/functions.php b/plugin/YPTSocket/functions.php
index 564314df67..06d5f01375 100644
--- a/plugin/YPTSocket/functions.php
+++ b/plugin/YPTSocket/functions.php
@@ -131,7 +131,7 @@ function restartServer($kill=true) {
         killProcessOnPort();
         sleep(1);
     }
-    $cmd = "php {$global['systemRootPath']}plugin/YPTSocket/server.php";
+    $cmd = YPTSocket::getStartServerCommand();
     echo 'Starting server with command ' . $cmd . PHP_EOL;
     exec($cmd, $output, $retval);
     echo implode(PHP_EOL,$output);
diff --git a/plugin/YPTSocket/serverCertbot.php b/plugin/YPTSocket/serverCertbot.php
index ab3a59355f..0239d35031 100644
--- a/plugin/YPTSocket/serverCertbot.php
+++ b/plugin/YPTSocket/serverCertbot.php
@@ -23,4 +23,4 @@ _session_write_close();
 killProcessOnPort();
 
 exec('certbot renew');
-exec("sudo ulimit -n 1048576 && sudo nohup php {$global['systemRootPath']}plugin/YPTSocket/server.php &");
+exec("sudo ".YPTSocket::getStartServerCommand());