Skip to content

Commit f8eb062

Browse files
committed
apply server control logger via the config
1 parent 02eda6c commit f8eb062

4 files changed

Lines changed: 23 additions & 68 deletions

File tree

src/Config/Logger.php

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
namespace Innmind\OperatingSystem\Config;
55

66
use Innmind\OperatingSystem\Config;
7+
use Innmind\Server\Control;
78
use Innmind\HttpTransport;
89
use Innmind\TimeWarp\Halt;
910
use Formal\AccessLayer\Connection;
@@ -30,6 +31,10 @@ public function __invoke(Config $config): Config
3031
->mapSQLConnection(fn($connection) => Connection\Logger::psr(
3132
$connection,
3233
$this->logger,
34+
))
35+
->mapServerControl(fn($server) => Control\Servers\Logger::psr(
36+
$server,
37+
$this->logger,
3338
));
3439
}
3540

src/OperatingSystem/Logger.php

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ public function status(): Status\Server
7676
#[\Override]
7777
public function control(): Control\Server
7878
{
79-
return Control\Servers\Logger::psr(
80-
$this->os->control(),
81-
$this->logger,
82-
);
79+
return $this->os->control();
8380
}
8481

8582
#[\Override]
@@ -97,10 +94,7 @@ public function sockets(): Sockets
9794
#[\Override]
9895
public function remote(): Remote
9996
{
100-
return Remote\Logger::psr(
101-
$this->os->remote(),
102-
$this->logger,
103-
);
97+
return $this->os->remote();
10498
}
10599

106100
#[\Override]

src/Remote/Logger.php

Lines changed: 0 additions & 60 deletions
This file was deleted.

tests/Remote/GenericTest.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,22 @@ public function testSsh()
7171
->unwrap();
7272
}
7373

74+
public function testSshLogger()
75+
{
76+
$remote = Generic::of(
77+
$this->server("ssh '-p' '42' 'user@my-vps' 'ls'"),
78+
Config::of()->map(Config\Logger::psr(new NullLogger)),
79+
);
80+
81+
$remoteServer = $remote->ssh(Url::of('ssh://user@my-vps:42/'));
82+
83+
$this->assertInstanceOf(Servers\Logger::class, $remoteServer);
84+
$remoteServer
85+
->processes()
86+
->execute(Command::foreground('ls'))
87+
->unwrap();
88+
}
89+
7490
public function testSshWithoutPort()
7591
{
7692
$remote = Generic::of(

0 commit comments

Comments
 (0)