From 75797c61f23bd3f3bf3c64f10083925e4c9cbe90 Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 13 Feb 2015 08:09:27 +0100 Subject: [PATCH] Improved logging with receiving mails --- include/items.php | 2 +- include/onepoll.php | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/include/items.php b/include/items.php index fb357d4db7..d6ca200854 100644 --- a/include/items.php +++ b/include/items.php @@ -1400,7 +1400,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa return 0; } if(count($r) > 1) { - logger('item_store: duplicated post occurred. Removing duplicates.'); + logger('item_store: duplicated post occurred. Removing duplicates. uri = '.$arr['uri'].' uid = '.$arr['uid']); q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `id` != %d ", dbesc($arr['uri']), intval($arr['uid']), diff --git a/include/onepoll.php b/include/onepoll.php index ba31c4d402..7b93a9a2f0 100644 --- a/include/onepoll.php +++ b/include/onepoll.php @@ -284,13 +284,13 @@ function onepoll_run(&$argv, &$argc){ } elseif($contact['network'] === NETWORK_MAIL || $contact['network'] === NETWORK_MAIL2) { - logger("onepoll: mail: Fetching", LOGGER_DEBUG); + logger("Mail: Fetching", LOGGER_DEBUG); $mail_disabled = ((function_exists('imap_open') && (! get_config('system','imap_disabled'))) ? 0 : 1); if($mail_disabled) return; - logger("onepoll: Mail: Enabled", LOGGER_DEBUG); + logger("Mail: Enabled", LOGGER_DEBUG); $mbox = null; $x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", @@ -312,7 +312,9 @@ function onepoll_run(&$argv, &$argc){ intval($mailconf[0]['id']), intval($importer_uid) ); - } + logger("Mail: Connected to " . $mailconf[0]['user']); + } else + logger("Mail: Connection error ".$mailconf[0]['user']." ".print_r(imap_errors())); } if($mbox) { @@ -523,7 +525,10 @@ function onepoll_run(&$argv, &$argc){ } } } - } + } else + logger("Mail: no mails for ".$mailconf[0]['user']); + + logger("Mail: closing connection for ".$mailconf[0]['user']); imap_close($mbox); } }