bn8/ldapsaisie
1
0
Fork 0
mirror of https://gitlab.easter-eggs.com/ee/ldapsaisie.git synced 2024-11-23 10:29:07 +01:00
Code Issues Projects Releases Wiki Activity

LScli : use LSlog_logger

Browse source
This commit is contained in:
Benjamin Renard 2020-05-08 15:20:29 +02:00
parent fb7efd9a14
commit 3e0829ba31
1 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/includes/class/class.LScli.php
View file

@ -20,12 +20,14 @@
******************************************************************************/ ******************************************************************************/
LSsession :: loadLSclass('LSlog_staticLoggerClass');
/** /**
* CLI Manager for LdapSaisie * CLI Manager for LdapSaisie
* *
* @author Benjamin Renard <brenard@easter-eggs.com> * @author Benjamin Renard <brenard@easter-eggs.com>
*/ */
class LScli { class LScli extends LSlog_staticLoggerClass {
// Configured commands // Configured commands
private static $commands = array(); private static $commands = array();
@ -120,7 +122,7 @@ class LScli {
**/ **/
public static function handle_args() { public static function handle_args() {
if (php_sapi_name() != "cli") { if (php_sapi_name() != "cli") {
LSlog :: fatal('Try to use LScli :: handle_args() in non-CLI context.'); self :: log_fatal('Try to use LScli :: handle_args() in non-CLI context.');
return; return;
} }
global $argv; global $argv;
@ -128,7 +130,7 @@ class LScli {
$ldap_server_id = false; $ldap_server_id = false;
$command = false; $command = false;
$command_args = array(); $command_args = array();
LSlog :: debug("handle_args :\n".varDump($argv)); self :: log_debug("handle_args :\n".varDump($argv));
for ($i=1; $i < count($argv); $i++) { for ($i=1; $i < count($argv); $i++) {
if (array_key_exists($argv[$i], self :: $commands)) { if (array_key_exists($argv[$i], self :: $commands)) {
if (!$command) if (!$command)
@ -190,13 +192,13 @@ class LScli {
LSlog :: setLevel($log_level); LSlog :: setLevel($log_level);
if (!$command) { if (!$command) {
LSlog :: debug("LScli :: handle_args() : no detected command => show usage"); self :: log_debug("LScli :: handle_args() : no detected command => show usage");
self :: usage(); self :: usage();
} }
// Select LDAP server (if not already done with -S/--ldap-server parameter) // Select LDAP server (if not already done with -S/--ldap-server parameter)
if ($ldap_server_id === false && !LSsession :: setLdapServer(0)) if ($ldap_server_id === false && !LSsession :: setLdapServer(0))
LSlog :: fatal('Fail to select first LDAP server.'); self :: log_fatal('Fail to select first LDAP server.');
// Run command // Run command
self :: run_command($command, $command_args); self :: run_command($command, $command_args);
@ -213,11 +215,11 @@ class LScli {
**/ **/
public static function run_command($command, $command_args=array(), $exit=true) { public static function run_command($command, $command_args=array(), $exit=true) {
if (php_sapi_name() != "cli") { if (php_sapi_name() != "cli") {
LSlog :: fatal('Try to use LScli :: run_command() in non-CLI context.'); self :: log_fatal('Try to use LScli :: run_command() in non-CLI context.');
return; return;
} }
if (!array_key_exists($command, self :: $commands)) { if (!array_key_exists($command, self :: $commands)) {
LSlog :: warning("LScli :: run_command() : invalid command '$command'."); self :: log_warning("LScli :: run_command() : invalid command '$command'.");
return false; return false;
} }
@ -225,11 +227,11 @@ class LScli {
if (self :: $commands[$command]['need_ldap_con']) { if (self :: $commands[$command]['need_ldap_con']) {
if (!class_exists('LSldap') || !LSldap :: isConnected()) if (!class_exists('LSldap') || !LSldap :: isConnected())
if (!LSsession :: LSldapConnect()) if (!LSsession :: LSldapConnect())
LSlog :: fatal('Fail to connect to LDAP server.'); self :: log_fatal('Fail to connect to LDAP server.');
} }
// Run command // Run command
LSlog :: debug("Run command $command with argument(s) '".implode("', '", $command_args)."'"); self :: log_debug("Run command $command with argument(s) '".implode("', '", $command_args)."'");
try { try {
$result = call_user_func(self :: $commands[$command]['handler'], $command_args); $result = call_user_func(self :: $commands[$command]['handler'], $command_args);
@ -259,7 +261,7 @@ class LScli {
$command = implode(' ', $command); $command = implode(' ', $command);
if ($escape_command_args) if ($escape_command_args)
$command = escapeshellcmd($command); $command = escapeshellcmd($command);
LSlog :: debug("Run external command: '$command'"); self :: log_debug("Run external command: '$command'");
$descriptorspec = array( $descriptorspec = array(
0 => array("pipe", "r"), // stdin 0 => array("pipe", "r"), // stdin
1 => array("pipe", "w"), // stdout 1 => array("pipe", "w"), // stdout
@ -268,7 +270,7 @@ class LScli {
$process = proc_open($command, $descriptorspec, $pipes); $process = proc_open($command, $descriptorspec, $pipes);
if (!is_resource($process)) { if (!is_resource($process)) {
LSlog :: error("Fail to run external command: '$command'"); self :: log_error("Fail to run external command: '$command'");
return false; return false;
} }
@ -286,9 +288,9 @@ class LScli {
$return_value = proc_close($process); $return_value = proc_close($process);
if (!empty($stderr) || $return_value != 0) if (!empty($stderr) || $return_value != 0)
LSlog :: error("Externan command error:\nCommand : $command\nStdout :\n$stdout\n\n - Stderr :\n$stderr"); self :: log_error("Externan command error:\nCommand : $command\nStdout :\n$stdout\n\n - Stderr :\n$stderr");
else else
LSlog :: debug("Externan command result:\n\tCommand : $command\n\tReturn code: $return_value\n\tOutput:\n\t\t- Stdout :\n$stdout\n\n\t\t- Stderr :\n$stderr"); self :: log_debug("Externan command result:\n\tCommand : $command\n\tReturn code: $return_value\n\tOutput:\n\t\t- Stdout :\n$stdout\n\n\t\t- Stderr :\n$stderr");
return array($return_value, $stdout, $stderr); return array($return_value, $stdout, $stderr);
} }