Fix skip_next_messages counting, combine logic
authorDavid Barksdale <amatus@amat.us>
Fri, 10 Nov 2017 23:45:13 +0000 (17:45 -0600)
committerDavid Barksdale <amatus@amat.us>
Fri, 10 Nov 2017 23:45:13 +0000 (17:45 -0600)
commit0d8e5fb7ae0282a1e4779c86e8cc30b803299e3e
treead394d73a0227594fb32c51fb04193141d9dd620
parenta3dace8401c482f18bddbad37da108433c1b08c7
Fix skip_next_messages counting, combine logic

This fixes messages like these:

Nov 10 08:57:34-927033 fs-22733 ERROR Request 0x6080017479a0 of type 100
at head of datastore queue for more than 1 m

And might fix issue #3903
src/datastore/datastore_api.c