]> WPIA git - gigi.git/commitdiff
More verbose error messages in SimpleSigner.
authorFelix Dörre <felix@dogcraft.de>
Thu, 10 Jul 2014 18:49:31 +0000 (20:49 +0200)
committerFelix Dörre <felix@dogcraft.de>
Thu, 10 Jul 2014 22:35:16 +0000 (00:35 +0200)
util/org/cacert/gigi/util/SimpleSigner.java

index cb4e492899fc45dd4ef7f3c413d7d0a16460800b..0a5c14a8b7a86dda88925fa7609ba28581bd99a5 100644 (file)
@@ -1,10 +1,12 @@
 package org.cacert.gigi.util;
 
+import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.InputStreamReader;
 import java.math.BigInteger;
 import java.security.GeneralSecurityException;
 import java.security.cert.CertificateFactory;
@@ -12,6 +14,7 @@ import java.security.cert.X509Certificate;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.Arrays;
 import java.util.Properties;
 
 import org.cacert.gigi.database.DatabaseConnection;
@@ -49,7 +52,7 @@ public class SimpleSigner {
                }
                running = true;
                readyMail = DatabaseConnection.getInstance().prepare(
-                       "SELECT id, csr_name, subject FROM emailcerts" + " WHERE csr_name is not null"//
+                       "SELECT id, csr_name, subject FROM emailcerts" + " WHERE csr_name is not null AND csr_name != ''"//
                                + " AND created=0"//
                                + " AND crt_name=''"//
                                + " AND warning<3");
@@ -176,10 +179,16 @@ public class SimpleSigner {
                                } catch (GeneralSecurityException e) {
                                        e.printStackTrace();
                                }
-                               System.out.println("ERROR: " + id);
+                               System.out.println("ERROR Afterwards: " + id);
                                warnMail.setInt(1, id);
                                warnMail.execute();
                        } else {
+                               BufferedReader br = new BufferedReader(new InputStreamReader(p1.getErrorStream()));
+                               String s;
+                               while ((s = br.readLine()) != null) {
+                                       System.out.println(s);
+                               }
+                               System.out.println(Arrays.toString(call));
                                System.out.println("ERROR: " + id);
                                warnMail.setInt(1, id);
                                warnMail.execute();