From dd34937e96826cc31d2010bc366dbfd14130995d Mon Sep 17 00:00:00 2001 From: Niklas Keller Date: Wed, 23 Mar 2016 23:45:30 +0100 Subject: [PATCH] Improve check output --- src/Commands/Check.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Commands/Check.php b/src/Commands/Check.php index cc5064a..bb9c523 100644 --- a/src/Commands/Check.php +++ b/src/Commands/Check.php @@ -4,6 +4,7 @@ namespace Kelunik\AcmeClient\Commands; use Amp\CoroutineResult; use Kelunik\AcmeClient\Stores\CertificateStore; +use Kelunik\AcmeClient\Stores\CertificateStoreException; use Kelunik\Certificate\Certificate; use League\CLImate\Argument\Manager; use League\CLImate\CLImate; @@ -30,17 +31,26 @@ class Check implements Command { $path = \Kelunik\AcmeClient\normalizePath($args->get("storage")) . "/certs/" . $server; $certificateStore = new CertificateStore($path); - $pem = (yield $certificateStore->get($args->get("name"))); + try { + $pem = (yield $certificateStore->get($args->get("name"))); + } catch (CertificateStoreException $e) { + $this->climate->br()->error("Certificate not found.")->br(); + + yield new CoroutineResult(1); + return; + } + $cert = new Certificate($pem); - $this->climate->info("Certificate is valid until " . date("d.m.Y", $cert->getValidTo())); + $this->climate->br(); + $this->climate->info(" Certificate is valid until " . date("d.m.Y", $cert->getValidTo()))->br(); if ($cert->getValidTo() > time() + $args->get("ttl") * 24 * 60 * 60) { yield new CoroutineResult(0); return; } - $this->climate->comment("Certificate is going to expire within the specified " . $args->get("ttl") . " days."); + $this->climate->comment(" Certificate is going to expire within the specified " . $args->get("ttl") . " days.")->br(); yield new CoroutineResult(1); }