From e9df560b74e5da392a84bd589138c30d6a9f2758 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 22 May 2013 12:23:42 +0200 Subject: [PATCH] New: Show process id in all command line scripts --- ChangeLog | 1 + dev/skeletons/skeleton_script.php | 4 ++-- scripts/bank/export-bank-receipts.php | 2 +- scripts/company/export-contacts-xls-example.php | 2 +- scripts/company/sync_contacts_dolibarr2ldap.php | 2 +- scripts/contracts/email_expire_services_to_customers.php | 2 +- .../contracts/email_expire_services_to_representatives.php | 2 +- scripts/cron/cron_run_jobs.php | 2 +- scripts/emailings/mailing-send.php | 2 +- scripts/invoices/email_unpaid_invoices_to_customers.php | 2 +- scripts/invoices/email_unpaid_invoices_to_representatives.php | 2 +- scripts/invoices/rebuild_merge_pdf.php | 2 +- scripts/members/sync_members_dolibarr2ldap.php | 2 +- scripts/members/sync_members_ldap2dolibarr.php | 2 +- scripts/user/sync_groups_dolibarr2ldap.php | 2 +- scripts/user/sync_groups_ldap2dolibarr.php | 2 +- scripts/user/sync_users_dolibarr2ldap.php | 2 +- scripts/user/sync_users_ldap2dolibarr.php | 2 +- scripts/withdrawals/build_withdrawal_file.php | 2 +- 19 files changed, 20 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0aaf9c1feb4..c8b829d14f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -13,6 +13,7 @@ For users: - New: Add option "filter=bank" onto script rebuild_merge_pdf.php to merge PDF that has one payment on a specific bank account.* - New: [ task #901 ] Add Extrafeild on Fiche Inter +- New: Show process id in all command line scripts For developers: - New: DolGraph can build graph with three lines. diff --git a/dev/skeletons/skeleton_script.php b/dev/skeletons/skeleton_script.php index 083e7ef680b..9eb17bbbaaf 100644 --- a/dev/skeletons/skeleton_script.php +++ b/dev/skeletons/skeleton_script.php @@ -34,7 +34,7 @@ if (substr($sapi_type, 0, 3) == 'cgi') { exit; } -// Init global variables +// Global variables $version='1.0'; $error=0; @@ -57,7 +57,7 @@ if (! $result > 0) { dol_print_error('',$user->error); exit; } $user->getrights(); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; if (! isset($argv[1])) { // Check parameters print "Usage: ".$script_file." param1 param2 ...\n"; exit; diff --git a/scripts/bank/export-bank-receipts.php b/scripts/bank/export-bank-receipts.php index 1d71c4edfe4..825d13a3afe 100755 --- a/scripts/bank/export-bank-receipts.php +++ b/scripts/bank/export-bank-receipts.php @@ -59,7 +59,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; if (! isset($argv[3]) || ! $argv[3]) { print "Usage: $script_file bank_ref bank_receipt_number (csv|tsv|excel|excel2007) [lang=xx_XX]\n"; diff --git a/scripts/company/export-contacts-xls-example.php b/scripts/company/export-contacts-xls-example.php index 760b351df7d..589b1eb5014 100644 --- a/scripts/company/export-contacts-xls-example.php +++ b/scripts/company/export-contacts-xls-example.php @@ -59,7 +59,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $fname = DOL_DATA_ROOT.'/export-contacts.xls'; diff --git a/scripts/company/sync_contacts_dolibarr2ldap.php b/scripts/company/sync_contacts_dolibarr2ldap.php index a9916100218..26228df1ad8 100644 --- a/scripts/company/sync_contacts_dolibarr2ldap.php +++ b/scripts/company/sync_contacts_dolibarr2ldap.php @@ -56,7 +56,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; print "Mails sending disabled (useless in batch mode)\n"; $conf->global->MAIN_DISABLE_ALL_MAILS=1; // On bloque les mails diff --git a/scripts/contracts/email_expire_services_to_customers.php b/scripts/contracts/email_expire_services_to_customers.php index d497274238e..ee7512405a3 100755 --- a/scripts/contracts/email_expire_services_to_customers.php +++ b/scripts/contracts/email_expire_services_to_customers.php @@ -65,7 +65,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $now=dol_now('tzserver'); $duration_value=isset($argv[2])?$argv[2]:'none'; diff --git a/scripts/contracts/email_expire_services_to_representatives.php b/scripts/contracts/email_expire_services_to_representatives.php index 9e070848235..8b995f31773 100755 --- a/scripts/contracts/email_expire_services_to_representatives.php +++ b/scripts/contracts/email_expire_services_to_representatives.php @@ -65,7 +65,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $now=dol_now('tzserver'); $duration_value=isset($argv[2])?$argv[2]:'none'; diff --git a/scripts/cron/cron_run_jobs.php b/scripts/cron/cron_run_jobs.php index 386c996f137..398a2d7f422 100755 --- a/scripts/cron/cron_run_jobs.php +++ b/scripts/cron/cron_run_jobs.php @@ -69,7 +69,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; // Check security key if ($key != $conf->global->CRON_KEY) diff --git a/scripts/emailings/mailing-send.php b/scripts/emailings/mailing-send.php index 23830007fae..786704299bf 100755 --- a/scripts/emailings/mailing-send.php +++ b/scripts/emailings/mailing-send.php @@ -56,7 +56,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; diff --git a/scripts/invoices/email_unpaid_invoices_to_customers.php b/scripts/invoices/email_unpaid_invoices_to_customers.php index 6de28e592c3..d518d41ab39 100755 --- a/scripts/invoices/email_unpaid_invoices_to_customers.php +++ b/scripts/invoices/email_unpaid_invoices_to_customers.php @@ -65,7 +65,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $now=dol_now('tzserver'); $duration_value=isset($argv[3])?$argv[3]:'none'; diff --git a/scripts/invoices/email_unpaid_invoices_to_representatives.php b/scripts/invoices/email_unpaid_invoices_to_representatives.php index 1ceaee6bb18..1ab5e15c2ec 100755 --- a/scripts/invoices/email_unpaid_invoices_to_representatives.php +++ b/scripts/invoices/email_unpaid_invoices_to_representatives.php @@ -65,7 +65,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $now=dol_now('tzserver'); $duration_value=isset($argv[2])?$argv[2]:'none'; diff --git a/scripts/invoices/rebuild_merge_pdf.php b/scripts/invoices/rebuild_merge_pdf.php index 354b245cb23..42504bd372e 100755 --- a/scripts/invoices/rebuild_merge_pdf.php +++ b/scripts/invoices/rebuild_merge_pdf.php @@ -56,7 +56,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; // Check parameters if (! isset($argv[1])) diff --git a/scripts/members/sync_members_dolibarr2ldap.php b/scripts/members/sync_members_dolibarr2ldap.php index 7a8f3bad42c..476837aa309 100755 --- a/scripts/members/sync_members_dolibarr2ldap.php +++ b/scripts/members/sync_members_dolibarr2ldap.php @@ -51,7 +51,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; if (! isset($argv[1]) || ! $argv[1]) { print "Usage: $script_file now\n"; diff --git a/scripts/members/sync_members_ldap2dolibarr.php b/scripts/members/sync_members_ldap2dolibarr.php index 45577cddcb0..85687eca95e 100755 --- a/scripts/members/sync_members_ldap2dolibarr.php +++ b/scripts/members/sync_members_ldap2dolibarr.php @@ -56,7 +56,7 @@ $forcecommit=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; // List of fields to get from LDAP $required_fields = array( diff --git a/scripts/user/sync_groups_dolibarr2ldap.php b/scripts/user/sync_groups_dolibarr2ldap.php index 602673c8cce..55a40209a9e 100755 --- a/scripts/user/sync_groups_dolibarr2ldap.php +++ b/scripts/user/sync_groups_dolibarr2ldap.php @@ -54,7 +54,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; /* if (! $conf->global->LDAP_SYNCHRO_ACTIVE) diff --git a/scripts/user/sync_groups_ldap2dolibarr.php b/scripts/user/sync_groups_ldap2dolibarr.php index 2c239197b41..ff9907e43ee 100755 --- a/scripts/user/sync_groups_ldap2dolibarr.php +++ b/scripts/user/sync_groups_ldap2dolibarr.php @@ -56,7 +56,7 @@ $forcecommit=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; // List of fields to get from LDAP diff --git a/scripts/user/sync_users_dolibarr2ldap.php b/scripts/user/sync_users_dolibarr2ldap.php index c6a26804b40..c02a676305e 100755 --- a/scripts/user/sync_users_dolibarr2ldap.php +++ b/scripts/user/sync_users_dolibarr2ldap.php @@ -54,7 +54,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; /* if (! $conf->global->LDAP_SYNCHRO_ACTIVE) diff --git a/scripts/user/sync_users_ldap2dolibarr.php b/scripts/user/sync_users_ldap2dolibarr.php index 6f7d63c41ce..13fb7464cd4 100755 --- a/scripts/user/sync_users_ldap2dolibarr.php +++ b/scripts/user/sync_users_ldap2dolibarr.php @@ -54,7 +54,7 @@ $forcecommit=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; // List of fields to get from LDAP $required_fields = array( diff --git a/scripts/withdrawals/build_withdrawal_file.php b/scripts/withdrawals/build_withdrawal_file.php index 0afb79b55d7..93e9239ecb7 100644 --- a/scripts/withdrawals/build_withdrawal_file.php +++ b/scripts/withdrawals/build_withdrawal_file.php @@ -50,7 +50,7 @@ $error=0; */ @set_time_limit(0); -print "***** ".$script_file." (".$version.") *****\n"; +print "***** ".$script_file." (".$version.") pid=".getmypid()." *****\n"; $datetimeprev = time();