Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Send an error message instead of the fallback report text to gsad. #1682

Merged
merged 8 commits into from
Sep 17, 2021
Merged

Send an error message instead of the fallback report text to gsad. #1682

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
28c3869
Send an error message instead of the fallback report text to gsad.
jhelmold Sep 8, 2021
0a17926
Added CHANGELOG entry for error messages from gvmcg.
jhelmold Sep 9, 2021
03c3a1f
Pass error messages from sensor performace reports to gsad.
jhelmold Sep 17, 2021
133e218
Merge branch 'gvmd-21.04' into performance_report_error_message
timopollmeier Sep 17, 2021
39e7601
Merge branch 'performance_report_error_message' of github.com:jhelmol…
jhelmold Sep 17, 2021
481daa9
Added the documentation for a new parameter
jhelmold Sep 17, 2021
d87a3c2
Added documentation for the function get_fallback_report_string ()
jhelmold Sep 17, 2021
7af6442
Moved some lines of code in function "manage_system_report (..)".
jhelmold Sep 17, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
### Deprecated
### Removed
### Fixed
- Ensure gvmd sends error messages if gvmcg fails [#1682](https://github.com/greenbone/gvmd/pull/1682)
- Fix resume task. [#1679](https://github.com/greenbone/gvmd/pull/1679)
-Added a dedicated error message for the create ticket dialogue when the create permission permission is missing [#1686](https://github.com/greenbone/gvmd/pull/1686)
- Added a dedicated error message for the create ticket dialogue when the create permission permission is missing [#1686](https://github.com/greenbone/gvmd/pull/1686)

[Unreleased]: https://github.com/greenbone/gvmd/compare/v21.4.3...HEAD

Expand Down
3 changes: 2 additions & 1 deletion src/gmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16171,6 +16171,7 @@ handle_get_system_reports (gmp_parser_t *gmp_parser, GError **error)
(&types,
get_system_reports_data->name,
get_system_reports_data->slave_id);

switch (ret)
{
case 1:
Expand Down Expand Up @@ -16264,7 +16265,7 @@ handle_get_system_reports (gmp_parser_t *gmp_parser, GError **error)
"</system_report>",
report_type_iterator_name (&types),
report_type_iterator_title (&types),
(ret == 3 ? "txt" : "png"),
(report_ret == 3 ? "txt" : "png"),
get_system_reports_data->start_time
? get_system_reports_data->start_time : "",
get_system_reports_data->end_time
Expand Down
Loading