From da711343f0871555bd09d401f7d6165fc768df67 Mon Sep 17 00:00:00 2001
From: mountford <mountford@google.com>
Date: Fri, 2 Dec 2016 11:21:24 -0800
Subject: [PATCH] Improve RDE error logging

RDE logs somewhat inscrutable errors when XML validation of the output fails due to bad data in Datastore. This CL adds a little more information to help us track down this sort of problem in the future.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=140872462
---
 java/google/registry/rde/RdeMarshaller.java     | 2 +-
 java/google/registry/rde/RdeStagingReducer.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/google/registry/rde/RdeMarshaller.java b/java/google/registry/rde/RdeMarshaller.java
index 6190336d6..ca038b811 100644
--- a/java/google/registry/rde/RdeMarshaller.java
+++ b/java/google/registry/rde/RdeMarshaller.java
@@ -148,7 +148,7 @@ public final class RdeMarshaller implements Serializable {
           Key.create(resource),
           e.getLinkedException(),
           getMarshaller().marshalLenient(element));
-      logger.severe(error);
+      logger.severe(e, error);
     }
     return DepositFragment.create(type, xml, error);
   }
diff --git a/java/google/registry/rde/RdeStagingReducer.java b/java/google/registry/rde/RdeStagingReducer.java
index 2eebee860..eaa56c949 100644
--- a/java/google/registry/rde/RdeStagingReducer.java
+++ b/java/google/registry/rde/RdeStagingReducer.java
@@ -162,7 +162,7 @@ public final class RdeStagingReducer extends Reducer<PendingDeposit, DepositFrag
     }
 
     // If an entity was broken, abort after writing as much logs/deposit data as possible.
-    verify(!failed);
+    verify(!failed, "RDE staging failed for TLD %s", tld);
 
     // Write a file to GCS containing the byte length (ASCII) of the raw unencrypted XML.
     //