bbs/clrghouz
1
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Revert 693e88 since unsuccessfully sent mail shouldnt be marked as sent

Browse Source
This commit is contained in:
Deon George 2024-10-09 14:11:11 +11:00
parent caac9c21a8
commit c76995fa00
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Classes/File/Send.php
View File

@ -125,6 +125,9 @@ class Send extends Base
if ($successful) { if ($successful) {
$end = time()-$this->start; $end = time()-$this->start;
Log::info(sprintf('%s:- Closing [%s], sent in [%d] with [%s] items',self::LOGKEY,$this->sending->nameas,$end,$this->sending->dbids->count())); Log::info(sprintf('%s:- Closing [%s], sent in [%d] with [%s] items',self::LOGKEY,$this->sending->nameas,$end,$this->sending->dbids->count()));
} else {
Log::alert(sprintf('%s:- Closing [%s], file NOT SENT successfully',self::LOGKEY,$this->sending->nameas));
} }
$this->sending->close($successful,$node); $this->sending->close($successful,$node);

4
app/Classes/Protocol/Binkp.php
View File

@ -1029,12 +1029,10 @@ final class Binkp extends BaseProtocol
* @return bool * @return bool
* @throws \Exception * @throws \Exception
* @todo We need to not add more files this session if a node skips a file * @todo We need to not add more files this session if a node skips a file
* @todo This incorrectly records the mail/file as sent and thus it is not sent again
*/ */
private function M_skip(string $buf): bool private function M_skip(string $buf): bool
{ {
Log::debug(sprintf('%s:+ Remote request to skip the file for now [%s]',self::LOGKEY,$buf)); Log::alert(sprintf('%s:+ Remote request to skip the file for now [%s]',self::LOGKEY,$buf));
throw new \Exception('We got a skip, but we dont handle it properly');
if ($file = $this->file_parse($buf)) { if ($file = $this->file_parse($buf)) {
if ($this->send->nameas if ($this->send->nameas