From e0855a22d3827ab9f8f29b8095bb638a09cf1368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Czern=C3=BD?= <pczerny@opennebula.systems>
Date: Mon, 31 May 2021 17:55:27 +0200
Subject: [PATCH] M #-: Sort hooks by execution id (#1262)

(cherry picked from commit 6a4417c4a79d6ab3efef9bc09ce9a2dea9f7160c)
---
 src/hm/HookLog.cc | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/hm/HookLog.cc b/src/hm/HookLog.cc
index a966482da8..d144627c8b 100644
--- a/src/hm/HookLog.cc
+++ b/src/hm/HookLog.cc
@@ -57,11 +57,7 @@ int HookLog::_dump_log(int hkid, int exec_id, std::string &xml_log)
 
     cmd << "SELECT body FROM "<< one_db::hook_log_table;
 
-    if ( hkid == -1 )
-    {
-        cmd << " ORDER BY hkid DESC";
-    }
-    else
+    if ( hkid != -1 )
     {
         cmd << " WHERE hkid = " << hkid;
     }
@@ -71,6 +67,8 @@ int HookLog::_dump_log(int hkid, int exec_id, std::string &xml_log)
         cmd << " AND exeid = " << exec_id;
     }
 
+    cmd << " ORDER BY hkid DESC, exeid";
+
     xml_log.append("<HOOKLOG>");
 
     cb.set_callback(&xml_log);