FIX old stuff

telefonicaid · Jan 11, 2024 · ae94b30 · ae94b30
1 parent 96035b8
commit ae94b30
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 40 deletions.
diff --git a/CHANGES_NEXT_RELEASE b/CHANGES_NEXT_RELEASE
@@ -11,6 +11,7 @@
 - Fix: provide more informative error description in some error responses in update/delete operations
 - Fix: proper use of "PartialUpdate" (instead of "Unprocessed") in responses in the case of partial updates/deletions (#3499)
 - Fix: response 404 Not Found "NotFound" errors instead of 422 Unprocessable Content "Unprocessed" in the case of missing attribute in existing entity in attribute update operations
+- Fix: "Internal Server Error" changed to "InternalServerError" in error responses
 - Add: CLI parameter -dbUri / env var ORION_MONGO_URI (#3794)
 - Fix: improve logs in MongoDB query logic
 - Fix: false positive in log deprecation logic when entity name (or other literal) includes the token "v1" (#4454)

diff --git a/doc/manuals/admin/diagnosis.md b/doc/manuals/admin/diagnosis.md
@@ -271,45 +271,20 @@ The symptoms of a database connection problem are the following:
 -   At startup time. The broker doesn't start and the following message
     appears in the log file:
 
-` X@08:04:45 main[313]: MongoDB error`
+```
+... msg=Database Startup Error (cannot connect to mongo - doing 100 retries with a 1000 millisecond interval)
+... msg=Fatal Error (MongoDB error)
+
+```
 
 -   During broker operation. Error message like the following ones
     appear in the responses sent by the broker.
 
 ```
-
-    ...
-    "errorCode": {
-        "code": "500",
-        "reasonPhrase": "Database Error",
-        "details": "collection: ... - exception: Null cursor"
-    }
-    ...
-
-    ...
-    "errorCode": {
-        "code": "500",
-        "reasonPhrase": "Database Error",
-        "details": "collection: ... - exception: socket exception [CONNECT_ERROR] for localhost:27017"
-    }
-    ...
-
-    ...
-    "errorCode": {
-        "code": "500",
-        "reasonPhrase": "Database Error",
-        "details": "collection: ... - exception: socket exception [FAILED_STATE] for localhost:27017"
-    }
-    ...
-
-    ...
-    "errorCode": {
-        "code": "500",
-        "reasonPhrase": "Database Error",
-        "details": "collection: ... - exception: DBClientBase::findN: transport error: localhost:27017 ns: orion.$cmd query: { .. }"
-    }
-    ...
-
+{
+    "error": "InternalServerError",
+    "description": "Database Error ..."
+}
 ```
 
 In both cases, check that the connection to MonogDB is correctly

diff --git a/doc/manuals/orion-api.md b/doc/manuals/orion-api.md
@@ -458,6 +458,7 @@ The `error` reporting is as follows:
   + HTTP 411 Length Required corresponds to `ContentLengthRequired` (`411`)
   + HTTP 413 Request Entity Too Large corresponds to `RequestEntityTooLarge` (`413`)
   + HTTP 415 Unsupported Media Type corresponds to `UnsupportedMediaType` (`415`)
++ Internal errors use `InternalServerError` (`500`)
 
 ## Multi tenancy
 

diff --git a/doc/manuals/user/known_limitations.md b/doc/manuals/user/known_limitations.md
@@ -7,11 +7,8 @@ this limitation into account, you will get messages such the following ones:
 
 ```
 {
-  "errorCode" : {
-    "code" : "413",
-    "reasonPhrase" : "Request Entity Too Large",
-    "details" : "payload size: 1500000, max size supported: 1048576"
-  }
+    "error": "RequestEntityTooLarge"
+    "description": "payload size: 1500000, max size supported: 1048576",
 }
 ```
 

diff --git a/src/lib/serviceRoutinesV2/getEntities.cpp b/src/lib/serviceRoutinesV2/getEntities.cpp
@@ -315,7 +315,7 @@ std::string getEntities
   {
     OrionError oe;
     entities.fill(parseDataP->qcrs.res, &oe);
-    TIMED_RENDER(answer = oe.toJson());
+    TIMED_RENDER(answer = oe.smartRender(V2));
     ciP->httpStatusCode = oe.code;
   }
   // 04. Render Entities response