Change connection errors to use APNSError type

src/client/certificate.rs

@@ -7,9 +7,8 @@ use time::precise_time_ns;
 use std::str;
 use std::result::Result;
 use std::io::Read;
-use client::response::ProviderResponse;
+use client::response::{ProviderResponse, APNSError};
 use client::headers::default_headers;
-use client::error::ProviderError;
 use notification::Notification;
 use client::{DEVELOPMENT, PRODUCTION};
 
@@ -52,7 +51,7 @@ impl CertificateClient {
     /// Create a new connection to APNs with custom certificate and key. Can be
     /// used to send notification to only one app.
     pub fn new<'a, R: Read>(sandbox: bool, certificate: &mut R, private_key: &mut R)
-                            -> Result<CertificateClient, ProviderError> {
+                            -> Result<CertificateClient, APNSError> {
         let host    = if sandbox { DEVELOPMENT } else { PRODUCTION };
         let mut ctx = SslContext::new(SslMethod::Sslv23).unwrap();
 

src/client/mod.rs

@@ -6,7 +6,6 @@
 mod certificate;
 mod response;
 mod headers;
-mod error;
 mod token;
 
 pub use self::token::TokenClient;

src/client/response.rs

@@ -2,11 +2,14 @@ use rustc_serialize::json::{Json, Object};
 use std::str;
 use time::{Tm, Timespec, at};
 use solicit::http::{Header, Response as HttpResponse};
+use solicit::http::client::tls::TlsConnectError;
+use solicit::client::ClientConnectError;
 use std::time::{Duration, Instant};
 use std::error::Error;
 use std::fmt;
 use std::thread;
 use std::sync::mpsc::Receiver;
+use openssl::ssl::error::SslError;
 
 use self::APNSError::*;
 
@@ -96,6 +99,12 @@ pub enum APNSError {
     /// The apns-topic header is mandatory when the client is connected using a
     /// certificate that supports multiple topics.
     MissingTopic,
+
+    /// OpenSSL configuration failed. Check the certificates and system support for OpenSSL
+    SslError(String),
+
+    /// Couldn't connect to APNS2.
+    ClientConnectError(String)
 }
 
 impl fmt::Debug for APNSError {
@@ -111,6 +120,18 @@ impl fmt::Display for APNSError {
     }
 }
 
+impl From<SslError> for APNSError {
+    fn from(e: SslError) -> APNSError {
+        APNSError::SslError(format!("Error generating an SSL context: {}", e.description()))
+    }
+}
+
+impl From<ClientConnectError<TlsConnectError>> for APNSError {
+    fn from(e: ClientConnectError<TlsConnectError>) -> APNSError {
+        APNSError::ClientConnectError(format!("Error connecting to the APNs servers: {}", e.description()))
+    }
+}
+
 impl Error for APNSError {
     fn description(&self) -> &str {
         match *self {
@@ -152,7 +173,9 @@ impl Error for APNSError {
                 "The apns-topic header of the request was not specified and was required. The \
                  apns-topic header is mandatory when the client is connected using a certificate \
                  that supports multiple topics"
-            }
+            },
+            SslError(ref e) => e,
+            ClientConnectError(ref e) => e,
         }
     }
 

src/client/token.rs

@@ -3,9 +3,8 @@ use solicit::client::{Client};
 use time::precise_time_ns;
 use std::result::Result;
 
-use client::response::ProviderResponse;
+use client::response::{ProviderResponse, APNSError};
 use client::headers::{default_headers, create_header};
-use client::error::ProviderError;
 use notification::Notification;
 use client::{DEVELOPMENT, PRODUCTION};
 
@@ -53,7 +52,7 @@ pub struct TokenClient {
 impl TokenClient {
     /// Create a new connection to APNs. `certificates` should point to system ca certificate
     /// file. In Ubuntu it's usually `/etc/ssl/certs/ca-certificates.crt`.
-    pub fn new<'a>(sandbox: bool, certificates: &str) -> Result<TokenClient, ProviderError> {
+    pub fn new<'a>(sandbox: bool, certificates: &str) -> Result<TokenClient, APNSError> {
         let host = if sandbox { DEVELOPMENT } else { PRODUCTION };
         let connector = TlsConnector::new(host, &certificates);
         let client = Client::with_connector(connector)?;