Changeset 23246

Timestamp:

05/08/07 11:17:51 (19 months ago)

Author:

zarzycki@…

Message:

Improved logging.

Files:

• trunk/launchd/src/launchd_core_logic.c (modified) (3 diffs)

trunk/launchd/src/launchd_core_logic.c

@@ -1671 +1671 @@
 
         if (jm->jm_port == mport) {
-                return jobmgr_find_by_pid(jm, upid, true);
+                jobmgr_assumes(jm, (ji = jobmgr_find_by_pid(jm, upid, true)) != NULL);
+                return ji;
         }
 
@@ -1709 +1710 @@
 
                 if (jobmgr_assumes(root_jobmgr, sysctl(mib, 4, &kp, &len, NULL, 0) != -1)) {
-                        jobmgr_log(root_jobmgr, LOG_ERR, "%s() was confused by PID %u: %s", __func__, ldc.pid, kp.kp_proc.p_comm);
+                        jobmgr_log(root_jobmgr, LOG_ERR, "%s() was confused by PID %u UID %u EUID %u Mach Port 0x%x: %s", __func__, ldc.pid, ldc.uid, ldc.euid, p, kp.kp_proc.p_comm);
                 }
         }
@@ -5227 +5228 @@
         }
 
-        if (getpid() != 1 && job_mig_intran(target_subset)) {
+        /* We call job_mig_intran2 because job_mig_intran logs on failure */
+        if (getpid() != 1 && job_mig_intran2(root_jobmgr, target_subset, getpid())) {
                 kr = 0;
                 goto out;