Compare commits
1 Commits
47af5384f6
...
3cc0c6f581
Author | SHA1 | Date | |
---|---|---|---|
3cc0c6f581 |
@ -58,7 +58,7 @@ final class Mail extends Send
|
|||||||
if ($successful) {
|
if ($successful) {
|
||||||
$this->complete = TRUE;
|
$this->complete = TRUE;
|
||||||
|
|
||||||
Log::info(sprintf('%s:- Successful close for [%d] - updating [%d] records.',self::LOGKEY,$this->type,$this->dbids->count()),['dbids'=>$this->dbids,'authd'=>$node->aka_remote_authed->pluck('id')]);
|
Log::debug(sprintf('%s:- Successful close for [%d] - updating [%d] records.',self::LOGKEY,$this->type,$this->dbids->count()),['dbids'=>$this->dbids,'authd'=>$node->aka_remote_authed->pluck('id')]);
|
||||||
|
|
||||||
// Update netmail table
|
// Update netmail table
|
||||||
if (($this->type === Send::T_NETMAIL)
|
if (($this->type === Send::T_NETMAIL)
|
||||||
|
@ -288,8 +288,6 @@ abstract class Protocol
|
|||||||
else {
|
else {
|
||||||
Log::withContext(['pid'=>getmypid()]);
|
Log::withContext(['pid'=>getmypid()]);
|
||||||
|
|
||||||
Log::debug(sprintf('%s:* Client session starting',self::LOGKEY));
|
|
||||||
|
|
||||||
$this->session($client,(new Address));
|
$this->session($client,(new Address));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -921,16 +921,8 @@ final class EMSI extends BaseProtocol implements CRCInterface,ZmodemInterface
|
|||||||
$t1 = $this->client->timer_set(self::EMSI_HSTIMEOUT);
|
$t1 = $this->client->timer_set(self::EMSI_HSTIMEOUT);
|
||||||
$t2 = $this->client->timer_set(self::EMSI_RESEND_TO);
|
$t2 = $this->client->timer_set(self::EMSI_RESEND_TO);
|
||||||
|
|
||||||
$c = 0;
|
|
||||||
while (! $this->client->timer_expired($t1)) {
|
while (! $this->client->timer_expired($t1)) {
|
||||||
try {
|
$ch = $this->client->read_ch(max( 1,min($this->client->timer_rest($t1),$this->client->timer_rest($t2))));
|
||||||
$ch = $this->client->read_ch(max( 1,min($this->client->timer_rest($t1),$this->client->timer_rest($t2))));
|
|
||||||
|
|
||||||
} catch (SocketException $e) {
|
|
||||||
if ($c++ > 2)
|
|
||||||
return self::TIMEOUT;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (static::DEBUG)
|
if (static::DEBUG)
|
||||||
Log::debug(sprintf('%s:- Got [%x] (%c)',self::LOGKEY,$ch,$ch));
|
Log::debug(sprintf('%s:- Got [%x] (%c)',self::LOGKEY,$ch,$ch));
|
||||||
|
|
||||||
@ -1201,7 +1193,7 @@ final class EMSI extends BaseProtocol implements CRCInterface,ZmodemInterface
|
|||||||
Log::debug(sprintf('%s:+ Start WAZOO Receive',self::LOGKEY));
|
Log::debug(sprintf('%s:+ Start WAZOO Receive',self::LOGKEY));
|
||||||
|
|
||||||
// @todo If the node is not defined in the DB node->address is NULL. Need to figure out how to handle those nodes.
|
// @todo If the node is not defined in the DB node->address is NULL. Need to figure out how to handle those nodes.
|
||||||
$rc = (new Zmodem($this->setup))->zmodem_receive($this->client,$zap,$this->recv,$this->node->address,$this->force_queue);
|
$rc = (new Zmodem)->zmodem_receive($this->client,$zap,$this->recv,$this->node->address,$this->force_queue);
|
||||||
|
|
||||||
return ($rc === self::RCDO || $rc === self::ERROR);
|
return ($rc === self::RCDO || $rc === self::ERROR);
|
||||||
}
|
}
|
||||||
@ -1225,7 +1217,7 @@ final class EMSI extends BaseProtocol implements CRCInterface,ZmodemInterface
|
|||||||
foreach ($this->node->aka_remote_authed as $ao) {
|
foreach ($this->node->aka_remote_authed as $ao) {
|
||||||
// Send mail
|
// Send mail
|
||||||
while ($this->send->mail($ao)) {
|
while ($this->send->mail($ao)) {
|
||||||
$z = new Zmodem($this->setup);
|
$z = new Zmodem;
|
||||||
|
|
||||||
if (! $z->zmodem_sendinit($this->client,$zap) && $this->send->togo_count)
|
if (! $z->zmodem_sendinit($this->client,$zap) && $this->send->togo_count)
|
||||||
$z->zmodem_sendfile($this->send,$this->node);
|
$z->zmodem_sendfile($this->send,$this->node);
|
||||||
@ -1233,7 +1225,7 @@ final class EMSI extends BaseProtocol implements CRCInterface,ZmodemInterface
|
|||||||
|
|
||||||
// Send files
|
// Send files
|
||||||
while ($this->send->files($ao)) {
|
while ($this->send->files($ao)) {
|
||||||
$z = new Zmodem($this->setup);
|
$z = new Zmodem;
|
||||||
|
|
||||||
if (! $z->zmodem_sendinit($this->client,$zap) && $this->send->togo_count)
|
if (! $z->zmodem_sendinit($this->client,$zap) && $this->send->togo_count)
|
||||||
$z->zmodem_sendfile($this->send,$this->node);
|
$z->zmodem_sendfile($this->send,$this->node);
|
||||||
|
@ -127,8 +127,6 @@ final class SocketServer {
|
|||||||
if (($accept = socket_accept($this->server)) === FALSE)
|
if (($accept = socket_accept($this->server)) === FALSE)
|
||||||
throw new SocketException(SocketException::CANT_ACCEPT,socket_strerror(socket_last_error($this->server)));
|
throw new SocketException(SocketException::CANT_ACCEPT,socket_strerror(socket_last_error($this->server)));
|
||||||
|
|
||||||
Log::debug(sprintf('%s:* TCP Loop Start',self::LOGKEY));
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$r = new SocketClient($accept);
|
$r = new SocketClient($accept);
|
||||||
|
|
||||||
|
@ -469,8 +469,7 @@ class Address extends Model
|
|||||||
->whereNotNull('export_at')
|
->whereNotNull('export_at')
|
||||||
->whereNull('sent_at')
|
->whereNull('sent_at')
|
||||||
->whereNull('echomails.deleted_at')
|
->whereNull('echomails.deleted_at')
|
||||||
->groupBy('addresses.id')
|
->groupBy('addresses.id');
|
||||||
->dontCache();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeUncollectedEchomailTotal($query)
|
public function scopeUncollectedEchomailTotal($query)
|
||||||
@ -504,8 +503,7 @@ class Address extends Model
|
|||||||
->whereNotNull('export_at')
|
->whereNotNull('export_at')
|
||||||
->whereNull('sent_at')
|
->whereNull('sent_at')
|
||||||
->whereNull('files.deleted_at')
|
->whereNull('files.deleted_at')
|
||||||
->groupBy('addresses.id')
|
->groupBy('addresses.id');
|
||||||
->dontCache();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function scopeUncollectedFilesTotal($query)
|
public function scopeUncollectedFilesTotal($query)
|
||||||
@ -537,8 +535,7 @@ class Address extends Model
|
|||||||
->whereNull('sent_pkt')
|
->whereNull('sent_pkt')
|
||||||
->whereNull('sent_at')
|
->whereNull('sent_at')
|
||||||
->whereNull('netmails.deleted_at')
|
->whereNull('netmails.deleted_at')
|
||||||
->groupBy('addresses.id')
|
->groupBy('addresses.id');
|
||||||
->dontCache();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user