Re: [Ejbca-develop] PublishQueueProcessWorker is not reporting the correct ServiceExecutionResult

[Tomas G. <to...@pr...>]

Hi Jaime,

I think it's great to have it here for initial discussion, and then create an issue. It's been vacation times here in Sweden, which is why it's been slow. I'm back next week and plan to look at your issues, which I am sure are interesting.

Expect more discussion during next week.

Cheers,
Tomas


On August 2, 2019 5:19:24 PM GMT+02:00, Jaime Hablutzel <hab...@gm...> wrote:
>Did you have the chance to take a look at my latest bug report emails?.
>
>Anyway, for reporting these type of minor bugs, maybe it would be
>better to
>directly create JIRA issues or is it still a good idea to post these
>reports here first to allow for previous discussion?.
>
>On Thu, Jul 25, 2019, 7:25 PM Jaime Hablutzel <hab...@gm...>
>wrote:
>
>> PublishQueueProcessWorker is currently always reporting a NO_ACTION
>> result, even when there are successes or failures. Patch follows:
>>
>> ---
>>
>modules/ejbca-common-web/src/org/ejbca/core/model/services/workers/PublishQueueProcessWorker.java
>> (revision 32884)
>> +++
>>
>modules/ejbca-common-web/src/org/ejbca/core/model/services/workers/PublishQueueProcessWorker.java
>> (date 1564026429457)
>> @@ -111,7 +111,7 @@
>>                          int publisherId = Integer.valueOf(ids[i]);
>>                          // Get everything from the queue for this
>> publisher id
>>                          BasePublisher publisher =
>> publisherSession.getPublisher(publisherId);
>> -
>> 
>publisherQueueSession.plainFifoTryAlwaysLimit100EntriesOrderByTimeCreated(getAdmin(),
>> publisher);
>> +
>> 
>publishingResult.append(publisherQueueSession.plainFifoTryAlwaysLimit100EntriesOrderByTimeCreated(getAdmin(),
>> publisher));
>>                      }
>>                  } else {
>>                      log.debug("No publisher ids configured for
>worker.");
>> @@ -121,23 +121,25 @@
>>                      runmap.put(this.serviceName, Boolean.FALSE);
>>                  }
>>              }
>> -        } else {
>> -           
>log.info(InternalEjbcaResources.getInstance().getLocalizedMessage("services.alreadyrunninginvm",
>> PublishQueueProcessWorker.class.getName()));
>> -        }
>> -        log.trace("<work");
>> -        if (publishingResult.getSuccesses() == 0 &&
>> publishingResult.getFailures() == 0) {
>> -            return new ServiceExecutionResult(Result.NO_ACTION,
>> -                    "Publishing Queue Service " + serviceName + "
>ran,
>> but the publishing queue was either empty or the publisher(s) could
>not
>> connect.");
>> -        } else {
>> -            if (publishingResult.getFailures() != 0) {
>> -                return new ServiceExecutionResult(Result.FAILURE,
>> -                        "Publishing Queue Service " + serviceName +
>" ran
>> with " + publishingResult.getFailures() + " failed publishing
>operations"
>> -                                + (publishingResult.getSuccesses()
>== 0 ?
>> "."
>> -                                        : " and " +
>> publishingResult.getSuccesses() + " successful publishing
>operations."));
>> -            } else {
>> -                return new ServiceExecutionResult(Result.SUCCESS,
>> "Publishing Queue Service " + serviceName + " ran with "
>> -                        + publishingResult.getSuccesses() + "
>successful
>> publishing operations.");
>> +            log.trace("<work");
>> +            if (publishingResult.getSuccesses() == 0 &&
>> publishingResult.getFailures() == 0) {
>> +                return new ServiceExecutionResult(Result.NO_ACTION,
>> +                        "Publishing Queue Service " + serviceName +
>"
>> ran, but the publishing queue was either empty or the publisher(s)
>could
>> not connect.");
>> +            } else {
>> +                if (publishingResult.getFailures() != 0) {
>> +                    return new
>ServiceExecutionResult(Result.FAILURE,
>> +                            "Publishing Queue Service " +
>serviceName + "
>> ran with " + publishingResult.getFailures() + " failed publishing
>> operations"
>> +                                    +
>(publishingResult.getSuccesses() ==
>> 0 ? "."
>> +                                    : " and " +
>> publishingResult.getSuccesses() + " successful publishing
>operations."));
>> +                } else {
>> +                    return new
>ServiceExecutionResult(Result.SUCCESS,
>> "Publishing Queue Service " + serviceName + " ran with "
>> +                            + publishingResult.getSuccesses() + "
>> successful publishing operations.");
>> +                }
>>              }
>> +        } else {
>> +            String msg =
>>
>InternalEjbcaResources.getInstance().getLocalizedMessage("services.alreadyrunninginvm",
>> PublishQueueProcessWorker.class.getName());
>> +            log.info(msg);
>> +            return new ServiceExecutionResult(Result.NO_ACTION,
>msg);
>>          }
>>      }
>>
>> --
>> Jaime Hablutzel -  +51 994690880
>>