[Groonga-commit] groonga/gcs [master] Fix regression around respnses of CreateDomain action

Back to archive index

null+****@clear***** null+****@clear*****
2012年 7月 19日 (木) 17:52:44 JST


SHIMODA Hiroshi	2012-07-19 17:52:44 +0900 (Thu, 19 Jul 2012)

  New Revision: aa2c199e0e9b1f75fbfb5e9760efcbba41a5b9a2
  https://github.com/groonga/gcs/commit/aa2c199e0e9b1f75fbfb5e9760efcbba41a5b9a2

  Log:
    Fix regression around respnses of CreateDomain action

  Modified files:
    lib/api/2011-02-01/configuration.js

  Modified: lib/api/2011-02-01/configuration.js (+9 -12)
===================================================================
--- lib/api/2011-02-01/configuration.js    2012-07-19 17:41:22 +0900 (d487b53)
+++ lib/api/2011-02-01/configuration.js    2012-07-19 17:52:44 +0900 (65b7e85)
@@ -9,18 +9,17 @@ exports.version = path.basename(__dirname);
 
 var XMLNS = 'http://cloudsearch.amazonaws.com/doc/2011-02-01';
 
-function createCommonErrorResponse(errorCode, message) {
+function createCommonErrorResponse(errorCode, error) {
   var doc = xmlbuilder.create();
 
-  doc.begin('Response', {version: '1.0'})
+  doc.begin('Response', { version: '1.0' })
     .element('Errors')
       .element('Error')
         .element('Code').text(errorCode).up()
-        .element('Message').text(message).up()
+        .element('Message').text(error.message || error).up()
       .up()
     .up()
-    .element('RequestID').up()
-  .up();
+    .element('RequestID').up();
 
   return doc.toString();
 }
@@ -59,22 +58,20 @@ function createDomainStatus(options) {
     .element('SearchService')
       .element('Endpoint').text(options.searchEndpoint || '').up()
     .up();
-//  .up(); // don't up anymore, because there is no parent yet!
   return domainStatus;
 }
 
 function createCreateDomainResponse(options) {
   var doc = xmlbuilder.create();
 
-  doc.begin('CreateDomainResponse', {version: '1.0'})
-    .attribute({ xmlns: XMLNS })
+  doc.begin('CreateDomainResponse', { version: '1.0' })
+    .attribute('xmlns', XMLNS)
     .element('CreateDomainResult')
       .addFragment(createDomainStatus(options))
     .up()
     .element('ResponseMetadata')
-      .element('RequestId').text((options.requestId || '')).up()
-    .up()
-  .up();
+      .element('RequestId').text(options.requestId || '').up()
+    .up();
 
   return doc.toString();
 }
@@ -98,7 +95,7 @@ handlers.CreateDomain = function(context, request, response) {
       requiresIndexDocuments: false
     }));
   } catch(error) {
-    var body = createCommonErrorResponse('InternalFailure', error.message);
+    var body = createCommonErrorResponse('InternalFailure', error);
     response.contentType('application/xml');
     response.send(body, 400);
   }
-------------- next part --------------
HTML$B$NE:IU%U%!%$%k$rJ]4I$7$^$7$?(B...
Download 



Groonga-commit メーリングリストの案内
Back to archive index