# HG changeset patch
# User HIROSE Yuuji <yuuji@gentei.org>
# Date 1608158216 -32400
# Node ID 4c02a9f862d790199111f890a3c98d2e24e0ce9b
# Parent  4e755437dbcbd5870600aa74ac2191ea616346f5
Prefix process id in all log entries

diff -r 4e755437dbcb -r 4c02a9f862d7 s4-blog.sh
--- a/s4-blog.sh	Thu Dec 17 07:34:51 2020 +0900
+++ b/s4-blog.sh	Thu Dec 17 07:36:56 2020 +0900
@@ -1402,7 +1402,7 @@
     echo "日記番号指定が無効です。" | html p
     return
   fi
-  err "blog_reply($$)  Started: `gdate +%S.%03N` blogrowid=$rowid"
+  err "blog_reply  Started: `gdate +%S.%03N` blogrowid=$rowid"
   blog_writable $rowid $user; rc=$?
   if [ $rc = 0 ]; then
     iswritable=true
@@ -1445,7 +1445,7 @@
       ## END:
       par2table $formdir/article.def
       st=$?
-      err "blog_reply($$): POSTdone `gdate +%S.%03N`  - st=$st title=$title owner=$owner user=$user, blogid=$blogid"
+      err "blog_reply: POSTdone `gdate +%S.%03N`  - st=$st title=$title owner=$owner user=$user, blogid=$blogid"
       case $st in
 	0|4)
 	  [ "$st" = "4" ] && act="書込削除"
@@ -1477,7 +1477,7 @@
 	    -D_FORM_='' \
 	    -D_DUMPTABLE_="syscmd(cat)" -D_DUMPHEAD_="" \
 	    $layout/html.m4.html $layout/form+dump-whead.m4.html
-  err "blog_reply($$) Finished: `gdate +%S.%03N` user=$user owner=[$owner] title=[$title]"
+  err "blog_reply Finished: `gdate +%S.%03N` user=$user owner=[$owner] title=[$title]"
 }
 
 blog_reply_article() {		# Direct link to article in some blog
diff -r 4e755437dbcb -r 4c02a9f862d7 s4-funcs.sh
--- a/s4-funcs.sh	Thu Dec 17 07:34:51 2020 +0900
+++ b/s4-funcs.sh	Thu Dec 17 07:36:56 2020 +0900
@@ -88,7 +88,7 @@
 iconcachekey="profimgcache_S"
 
 # Start debug logging
-logtag="${S4WORLD:+{$S4WORLD\}}"
+logtag="[$$]${S4WORLD:+{$S4WORLD\}}"
 exec 3>> $logdir/debug.out
 err() {
   echo "[`date +%F-%T%z`]$logtag $@" 1>&3
diff -r 4e755437dbcb -r 4c02a9f862d7 s4-world.sh
--- a/s4-world.sh	Thu Dec 17 07:34:51 2020 +0900
+++ b/s4-world.sh	Thu Dec 17 07:36:56 2020 +0900
@@ -77,7 +77,7 @@
       return -4
     fi
   fi
-  err "`gdate +%S.%3N` Starting account synchronization[$$]"
+  err "`gdate +%S.%3N` Starting account synchronization"
 
   prevsync=`tail -1 $syncflag|colrm 20`	# 2020-06-21 12:30:00 = 19cols
   syncall=${db%.*}.syncall
@@ -139,10 +139,10 @@
 EOF
      )
   if [ -n "$num" -a "$num" -eq 0 ]; then
-    err "`gdate +%S.%3N` Account synchronization[$$] done in difference $num"
+    err "`gdate +%S.%3N` Account synchronization done in difference $num"
     echo "`date '+%F %T'`: Sync done by process $$" >> $syncflag
   else
-    err "Account synch[$$] failed or bailed with num=[$num]"
+    err "Account synch failed or bailed with num=[$num]"
   fi
   return $num
 }