summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@helsinki.at>2011-03-30 16:36:00 (GMT)
committerChristian Pointner <equinox@helsinki.at>2011-03-30 16:36:00 (GMT)
commita46c8a230ca0ca4963ea4eceee2bc76deb3f8f57 (patch)
tree187508533a196e25efbf6de386e52a62dab6df7c
parent7904f5fddf5866a586c721e42832fa475e6185ce (diff)
noprml ignores dummy now cart
-rw-r--r--rhnop-server/debian/changelog6
-rw-r--r--rhnop-server/nopsyncd.conf3
-rw-r--r--rhnop-server/qlistener.lua2
3 files changed, 10 insertions, 1 deletions
diff --git a/rhnop-server/debian/changelog b/rhnop-server/debian/changelog
index a82b0a4..cf023e3 100644
--- a/rhnop-server/debian/changelog
+++ b/rhnop-server/debian/changelog
@@ -1,3 +1,9 @@
+rhnop-server (0.4) unstable; urgency=low
+
+ * noprml ignores dummy carts now.
+
+ -- Christian Pointner <equinox@helsinki> Wed, 30 Mar 2011 18:35:22 +0200
+
rhnop-server (0.3) unstable; urgency=low
* some cleanup.
diff --git a/rhnop-server/nopsyncd.conf b/rhnop-server/nopsyncd.conf
index 0338cb6..ec7ba0a 100644
--- a/rhnop-server/nopsyncd.conf
+++ b/rhnop-server/nopsyncd.conf
@@ -2,6 +2,9 @@ queue_name=/rhnop
tcp_host=*
tcp_port=2345
+dummy_now_cart=50001
+dummy_next_cart=50002
+
rddb_db=rivendell
rddb_host=127.0.0.1
#rddb_port=3306
diff --git a/rhnop-server/qlistener.lua b/rhnop-server/qlistener.lua
index b419737..3885f41 100644
--- a/rhnop-server/qlistener.lua
+++ b/rhnop-server/qlistener.lua
@@ -50,7 +50,7 @@ function handle_message(msg)
io.stderr:write("ignoring malformed message\n")
else
-- TODO better sanity checks: is now info new or just next?
- if last_cart ~= nowcart then
+ if last_cart ~= nowcart and nowcart ~= conf.dummy_now_cart then
last_cart = nowcart
handle_now(timestamp, nowcart, nowlen)
end