xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #3458 Increase ldm to edexBridge shared memory queue." into omaha_14.2.2

Browse source 
Former-commit-id: a93ba59bd1 [formerly 5aa1d7b692] [formerly a93ba59bd1 [formerly 5aa1d7b692] [formerly 214ec8cfa5 [formerly 1db29b26474545b85445ca4f0d5da75ff77f88c4]]]
Former-commit-id: 214ec8cfa5
Former-commit-id: 89aa442f9e [formerly 6cecfcd9dc]
Former-commit-id: 421a706c36
This commit is contained in:
Ron Anderson 2014-08-06 12:06:32 -05:00 • committed by Gerrit Code Review
commit e75c785df6
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ldm/src/pqact/pqact.c
View file

@ -6,6 +6,9 @@
/* /*
* ldm server mainline program module * ldm server mainline program module
*
* Updated on: Aug 05, 2014 (Omaha #3458: Increased edexBridge queue size to 10000)
* Author: rjpeter
*/ */
#include <ldmconfig.h> #include <ldmconfig.h>
@ -251,7 +254,7 @@ main(int ac, char *av[])
prod_class_t clss; prod_class_t clss;
int toffset = TOFFSET_NONE; int toffset = TOFFSET_NONE;
int loggingToStdErr = 0; int loggingToStdErr = 0;
unsigned queue_size = 5000; unsigned queue_size = 10000;
conffilename = DEFAULT_CONFFILENAME; conffilename = DEFAULT_CONFFILENAME;

3
nativeLib/edexBridge/edexBridge.cpp
View file

@ -7,6 +7,8 @@
* Author: bkowal * Author: bkowal
* Updated on: May 06, 2014 (Issue #3102: Updated to call cleanup if connect failed. Limit number of messages to be sent to QPID on a single send call) * Updated on: May 06, 2014 (Issue #3102: Updated to call cleanup if connect failed. Limit number of messages to be sent to QPID on a single send call)
* Author: rjpeter * Author: rjpeter
* Updated on: Aug 05, 2014 (Omaha #3458: Added logging of error when issue occurs on send)
* Author: rjpeter
*/ */
#include <qpid/messaging/Connection.h> #include <qpid/messaging/Connection.h>
@ -116,6 +118,7 @@ public:
} }
} catch (const std::exception& error) { } catch (const std::exception& error) {
// Error occurred during communication. Clean up the connection and return the number of messages processed. // Error occurred during communication. Clean up the connection and return the number of messages processed.
uerror(error.what());
cleanup(); cleanup();
} }

2
rpms/awips2.core/Installer.ldm/component.spec
View file

@ -9,7 +9,7 @@
Name: awips2-ldm Name: awips2-ldm
Summary: AWIPS II LDM Distribution Summary: AWIPS II LDM Distribution
Version: %{_ldm_version} Version: %{_ldm_version}
Release: 13 Release: 14
Group: AWIPSII Group: AWIPSII
BuildRoot: /tmp BuildRoot: /tmp
BuildArch: noarch BuildArch: noarch