Gestion des logs

La fonction ple_enable_log affiche les paramètres passés au script dans la log. Il est plus facile, pour moi, de reproduire les problèmes en connaissant exactement les paramètres utilisés. La fonction script_banner a été supprimée de tous les scripts. La variable PARAMS a été ajoutée à tous les scripts et est passée en paramètre à la fonction ple_enable_logs. 99% des scripts ont été modifiés. Certains scripts ont reçu des corrections mineures indépendantes des actions décrient ci-dessus. Pour mémoire, script ayant permis les modifications : [...] while read script_name do [ "$script_name" == "/home/kangs/plescripts/tmp/clean_scripts.sh" ] && continue || true line_separator info "$script_name" LN exec_cmd "sed -i '/ME=\\\$0/a typeset -r PARAMS=\"\\\$*\"' $script_name" LN exec_cmd "sed -i '/^script_banner/ { N; d; }' $script_name" LN exec_cmd "sed -i 's/ple_enable_log/ple_enable_log -params "\\\$PARAMS/"' $script_name" LN done<<<$(find ~/plescripts -perm /u+x -type f)
PhilippeLeroux · Jul 3, 2017 · 2b0e536 · 2b0e536
1 parent a68f888
commit 2b0e536
Show file tree

Hide file tree

Showing 246 changed files with 360 additions and 464 deletions.
diff --git a/change_infra_config.sh b/change_infra_config.sh
@@ -6,6 +6,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME
 
@@ -36,9 +37,7 @@ do
 	esac
 done
 
-#ple_enable_log
-
-script_banner $ME $*
+#ple_enable_log -params $PARAMS
 
 # Liste des variables a modifier :
 #	Serveur d'infra

diff --git a/configure_global.cfg.sh b/configure_global.cfg.sh
@@ -6,6 +6,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME ...."
 

diff --git a/configure_network/setup_dns.sh b/configure_network/setup_dns.sh
@@ -8,6 +8,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage="Usage : $ME -db=name -node=#"
 
 typeset		db=undef

diff --git a/configure_network/setup_iface_and_hostname.sh b/configure_network/setup_iface_and_hostname.sh
@@ -8,6 +8,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 
 typeset -r str_usage="Usage : $ME -db=<id> -node=<#>"
 

diff --git a/database_servers/apply_ssh_prereq_on_all_nodes.sh b/database_servers/apply_ssh_prereq_on_all_nodes.sh
@@ -7,10 +7,9 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage="Usage : $ME -db=<str>"
 
-script_banner $ME $*
-
 typeset db=undef
 
 while [ $# -ne 0 ]

diff --git a/database_servers/check_bin_oracle_size.sh b/database_servers/check_bin_oracle_size.sh
@@ -6,6 +6,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME exit 1 if $ORACLE_HOME/bin/oracle size == 0"
 
@@ -32,9 +33,7 @@ do
 	esac
 done
 
-#ple_enable_log
-
-script_banner $ME $*
+#ple_enable_log -params $PARAMS
 
 if [ x"$ORACLE_HOME" == x ]
 then

diff --git a/database_servers/cleanup_infra.sh b/database_servers/cleanup_infra.sh
@@ -8,6 +8,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage="
 Usage : $ME
 	-db=name
@@ -57,9 +58,7 @@ do
 	esac
 done
 
-ple_enable_log
-
-script_banner $ME $*
+ple_enable_log -params $PARAMS
 
 exit_if_param_undef db	"$str_usage"
 

diff --git a/database_servers/clone_master.sh b/database_servers/clone_master.sh
@@ -9,6 +9,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 
 typeset		db=undef
 typeset -i	node=-1
@@ -96,9 +97,7 @@ do
 	esac
 done
 
-ple_enable_log
-
-script_banner $ME $*
+ple_enable_log -params $PARAMS
 
 exit_if_param_undef db 		"$str_usage"
 

diff --git a/database_servers/cluster_verify.sh b/database_servers/cluster_verify.sh
@@ -6,11 +6,10 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME [-all]"
 
-script_banner $ME $*
-
 typeset	all=no
 
 while [ $# -ne 0 ]

diff --git a/database_servers/create_database_servers.sh b/database_servers/create_database_servers.sh
@@ -7,8 +7,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
-
-script_banner $ME $*
+typeset -r PARAMS="$*"
 
 typeset		db=undef
 typeset		vmGroup

diff --git a/database_servers/create_systemd_service_oracledb.sh b/database_servers/create_systemd_service_oracledb.sh
@@ -8,6 +8,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage="Usage : $ME"
 
 [ "$USER" != "root" ] && error "User must be root." && exit 1

diff --git a/database_servers/define_new_server.sh b/database_servers/define_new_server.sh
@@ -9,6 +9,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 
 typeset -r	all_params="$*"
 
@@ -42,8 +43,6 @@ add_usage "[-ip_node=node]"			"nœud IP, sinon prend la première IP disponible.
 
 typeset -r str_usage="Usage : $ME\n$(print_usage)"
 
-script_banner $ME $*
-
 #	rac si max_nodes vaut plus de 1
 typeset		db_type=std
 

diff --git a/database_servers/install_grid12cR1.sh b/database_servers/install_grid12cR1.sh
@@ -9,6 +9,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME
 	-db=name       Identifiant de la base
@@ -116,9 +117,7 @@ do
 	esac
 done
 
-ple_enable_log
-
-script_banner $ME $*
+ple_enable_log -params $PARAMS
 
 exit_if_param_undef	db	"$str_usage"
 

diff --git a/database_servers/install_grid12cR2.sh b/database_servers/install_grid12cR2.sh
@@ -9,6 +9,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME
 	-db=name
@@ -127,9 +128,7 @@ do
 	esac
 done
 
-ple_enable_log
-
-script_banner $ME $*
+ple_enable_log -params $PARAMS
 
 exit_if_param_undef db	"$str_usage"
 

diff --git a/database_servers/install_kernel.sh b/database_servers/install_kernel.sh
@@ -6,6 +6,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME
 	-version=version    like -version=3.8.13-118.17.5
@@ -41,9 +42,7 @@ do
 	esac
 done
 
-#ple_enable_log
-
-script_banner $ME $*
+#ple_enable_log -params $PARAMS
 
 must_be_user root
 

diff --git a/database_servers/install_oracle.sh b/database_servers/install_oracle.sh
@@ -10,6 +10,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 
 typeset db=undef
 typeset action=install
@@ -78,9 +79,7 @@ do
 	esac
 done
 
-ple_enable_log
-
-script_banner $ME $*
+ple_enable_log -params $PARAMS
 
 exit_if_param_undef		db							"$str_usage"
 exit_if_param_invalid	action	"install config"	"$str_usage"

diff --git a/database_servers/install_sample_schema.sh b/database_servers/install_sample_schema.sh
@@ -8,6 +8,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 
 typeset db=undef
 
@@ -44,8 +45,6 @@ do
 	esac
 done
 
-script_banner $ME $*
-
 must_be_executed_on_server $client_hostname
 
 exit_if_param_undef db	"$str_usage"

diff --git a/database_servers/oracle_uninstall.sh b/database_servers/oracle_uninstall.sh
@@ -6,13 +6,12 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Ne pas utiliser ce script directement mais :
 ./uninstall.sh -oracle
 "
 
-script_banner $ME $*
-
 while [ $# -ne 0 ]
 do
 	case $1 in

diff --git a/database_servers/rac_ping_all_ifaces.sh b/database_servers/rac_ping_all_ifaces.sh
@@ -7,11 +7,10 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME ...."
 
-script_banner $ME $*
-
 typeset		db=undef
 typeset	-i	node=-1
 

diff --git a/database_servers/revert_to_master.sh b/database_servers/revert_to_master.sh
@@ -7,6 +7,7 @@
 EXEC_CMD_ACTION=NOP
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME [-doit] [-force]
 	Le GI et le logiciel Oracle doivent avoir été désinstallés.
@@ -19,8 +20,6 @@ typeset -r str_usage=\
 	Le paramètre -force permet de ne pas tester si le Grid Infra est installé.
 "
 
-script_banner $ME $*
-
 typeset force=no
 
 while [ $# -ne 0 ]

diff --git a/database_servers/show_info_server.sh b/database_servers/show_info_server.sh
@@ -8,6 +8,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 
 typeset -r str_usage="Usage : $ME -db=name"
 

diff --git a/database_servers/show_prereq_failed.sh b/database_servers/show_prereq_failed.sh
@@ -7,11 +7,10 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME -db=identifiant"
 
-script_banner $ME $*
-
 typeset db=undef
 
 while [ $# -ne 0 ]

diff --git a/database_servers/system_info.sh b/database_servers/system_info.sh
@@ -7,6 +7,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage="Usage : $ME ...."
 
 while [ $# -ne 0 ]
@@ -27,7 +28,7 @@ do
 	esac
 done
 
-ple_enable_log
+ple_enable_log -params $PARAMS
 
 exec_cmd "hostname"
 LN

diff --git a/database_servers/test_synchro_ntp.sh b/database_servers/test_synchro_ntp.sh
@@ -6,6 +6,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 
 typeset	-i	max_loops=10
 
@@ -41,9 +42,7 @@ do
 	esac
 done
 
-#ple_enable_log
-
-script_banner $ME $*
+#ple_enable_log -params $PARAMS
 
 typeset -r	hn=$(hostname -s)
 typeset	-i	wait_time=10

diff --git a/database_servers/uninstall.sh b/database_servers/uninstall.sh
@@ -7,6 +7,7 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME
 	Désinstalle tous les composants d'un serveur ou cluster Oracle.
@@ -134,9 +135,7 @@ do
 	esac
 done
 
-ple_enable_log
-
-script_banner $ME $*
+ple_enable_log -params $PARAMS
 
 must_be_user root
 

diff --git a/db/add_sysdba_credential_for_pdb.sh b/db/add_sysdba_credential_for_pdb.sh
@@ -8,15 +8,14 @@
 EXEC_CMD_ACTION=EXEC
 
 typeset -r ME=$0
+typeset -r PARAMS="$*"
 typeset -r str_usage=\
 "Usage : $ME -db=name -pdb=name [-service=auto]
 
 Le script prend en charge les RACs.
 
 Pour un dataguard exécuter ce script sur tous les nœuds."
 
-script_banner $ME $*
-
 typeset db=undef
 typeset pdb=undef
 typeset	service=auto