backend/server/handlers/xmlrpc/abrt.py | 3 + java/code/src/com/redhat/rhn/domain/server/Crash.hbm.xml | 1 java/code/src/com/redhat/rhn/domain/server/Crash.java | 17 ++++++++++ java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 6 +++ java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java | 3 + java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf | 8 ++++ schema/spacewalk/common/tables/rhnServerCrash.sql | 1 schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/009-rhnServerCrash.sql | 1 8 files changed, 39 insertions(+), 1 deletion(-)
New commits: commit 3543bd56b741e83c4bb4e4c45e51cd4454e7de93 Author: Milan Zazrivec mzazrivec@redhat.com Date: Wed Mar 20 13:10:17 2013 +0100
abrt: store crash uuid
diff --git a/backend/server/handlers/xmlrpc/abrt.py b/backend/server/handlers/xmlrpc/abrt.py index 51548be..c634399 100644 --- a/backend/server/handlers/xmlrpc/abrt.py +++ b/backend/server/handlers/xmlrpc/abrt.py @@ -126,7 +126,8 @@ class Abrt(rhnHandler): 'executable', 'kernel', 'reason', - 'username'] + 'username', + 'uuid']
def _get_crash_id(self, server_id, crash): h = rhnSQL.prepare(_query_get_crash) diff --git a/java/code/src/com/redhat/rhn/domain/server/Crash.hbm.xml b/java/code/src/com/redhat/rhn/domain/server/Crash.hbm.xml index 71d118a..e88f354 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Crash.hbm.xml +++ b/java/code/src/com/redhat/rhn/domain/server/Crash.hbm.xml @@ -23,6 +23,7 @@ PUBLIC "-//Hibernate/Hibernate Mapping DTD 3.0//EN" <property name="crash" column="crash" type="string"/> <property name="path" column="path" type="string"/> <property name="count" column="count" type="long"/> + <property name="uuid" column="uuid" type="string"/> <property name="analyzer" column="analyzer" type="string"/> <property name="architecture" column="architecture" type="string"/> <property name="cmdline" column="cmdline" type="string"/> diff --git a/java/code/src/com/redhat/rhn/domain/server/Crash.java b/java/code/src/com/redhat/rhn/domain/server/Crash.java index 82c0f6c..ef55720 100644 --- a/java/code/src/com/redhat/rhn/domain/server/Crash.java +++ b/java/code/src/com/redhat/rhn/domain/server/Crash.java @@ -33,6 +33,7 @@ public class Crash extends BaseDomainHelper { private String crash; private String path; private long count; + private String uuid; private String analyzer; private String architecture; private String cmdline; @@ -138,6 +139,22 @@ public class Crash extends BaseDomainHelper { }
/** + * Get the crash uuid. + * @return Returns the crash uuid. + */ + public String getUuid() { + return uuid; + } + + /** + * Set the crash uuid. + * @param uuidIn The crash uuid to set. + */ + public void setUuid(String uuidIn) { + uuid = uuidIn; + } + + /** * Get the crash analyzer. * @return Returns the crash analyzer. */ diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml index 3db308c..1d5c3a1 100644 --- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml +++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml @@ -16441,6 +16441,12 @@ The Tree Path, Kickstart RPM, Base Channel, and Installer Generation should alwa <context context-type="sourcefile">/rhn/systems/details/SoftwareCrashDetail.do</context> </context-group> </trans-unit> + <trans-unit id="crashes.jsp.uuid"> + <source>UUID</source> + <context-group name="ctx"> + <context context-type="sourcefile">/rhn/systems/details/SoftwareCrashDetail.do</context> + </context-group> + </trans-unit> <trans-unit id="crashes.jsp.analyzer"> <source>Analyzer</source> <context-group name="ctx"> diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java index 57c98da..98b0c0d 100644 --- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java +++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/crash/CrashHandler.java @@ -129,6 +129,7 @@ public class CrashHandler extends BaseHandler { * #prop("string", "crash") * #prop("string", "path") * #prop("int", "count") + * #prop("string", "uuid") * #prop("string", "analyzer") * #prop("string", "architecture") * #prop("string", "cmdline") @@ -155,6 +156,8 @@ public class CrashHandler extends BaseHandler { crashMap.put("crash", crash.getCrash()); crashMap.put("path", crash.getPath()); crashMap.put("count", crash.getCount()); + crashMap.put("uuid", + StringUtils.defaultString(crash.getUuid())); crashMap.put("analyzer", StringUtils.defaultString(crash.getAnalyzer())); crashMap.put("architecture", diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf index 71e086c..3ca51b7 100644 --- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf +++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/crash_details.jspf @@ -33,6 +33,14 @@ </tr> <tr> <th> + <bean:message key="crashes.jsp.uuid"/>: + </th> + <td> + <c:out value="${crash.uuid}"/> + </td> + </tr> + <tr> + <th> <bean:message key="crashes.jsp.analyzer"/>: </th> <td> diff --git a/schema/spacewalk/common/tables/rhnServerCrash.sql b/schema/spacewalk/common/tables/rhnServerCrash.sql index 486818a..26435b4 100644 --- a/schema/spacewalk/common/tables/rhnServerCrash.sql +++ b/schema/spacewalk/common/tables/rhnServerCrash.sql @@ -24,6 +24,7 @@ create table rhnServerCrash crash varchar2(512) not null, path varchar2(1024) not null, count number not null, + uuid varchar2(256), analyzer varchar2(128), architecture varchar2(16), cmdline varchar2(2048), diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/009-rhnServerCrash.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/009-rhnServerCrash.sql new file mode 100644 index 0000000..0534983 --- /dev/null +++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/009-rhnServerCrash.sql @@ -0,0 +1 @@ +alter table rhnServerCrash add column uuid varchar2(256);
spacewalk-commits@lists.fedorahosted.org