nopcollectd works now

1 files changed, 9 insertions, 10 deletions

diff --git a/rhnop-client/nopcollectd b/rhnop-client/nopcollectd
index 0944323..ef3dcd4 100755
--- a/rhnop-client/nopcollectd
+++ b/rhnop-client/nopcollectd
@@ -26,6 +26,7 @@
 --
 
 require "socket"
+db = require "db"
 
 if #arg < 1 then
    io.stderr:write("too few parameters\n")
@@ -35,14 +36,11 @@ end
 conffile = "nopcollectd." .. arg[1] .. ".conf"
 conf = require "conf"
 
-src_db = require "db"
-assert(src_db:init(conf.src_db, conf.src_user, conf.src_pwd, conf.src_host, conf.src_port, conf.src.table))
-
-dst_db = require "db"
-assert(dst_db:init(conf.dst_db, conf.dst_user, conf.dst_pwd, conf.dst_host, conf.dst_port, conf.dst.table))
+src_db = assert(db.init(conf.src_db, conf.src_user, conf.src_pwd, conf.src_host, conf.src_port, conf.src_table))
+dst_db = assert(db.init(conf.dst_db, conf.dst_user, conf.dst_pwd, conf.dst_host, conf.dst_port, conf.dst_table))
 
 local sock = assert(socket.tcp())
-local ret, err = sock:connect(conf.host, conf.port)
+local ret, err = sock:connect(conf.sync_host, conf.sync_port)
 if ret == nil then
    print(err)
    return 1
@@ -50,13 +48,14 @@ end
 print "connection established"
 
 local last = dst_db:getLastEntry()
-cur = assert(src_db:findMissingEntries(last)
+print("last timestamp was " .. last)
+local cur = assert(src_db:findMissingEntries(last))
 local cnt = 0
 while true do
-   local data = srd_db:getNextMissingEntry(cur)
+   local data = src_db:getNextMissingEntry(cur)
    if data == nil then break end
    local ret, err = dst_db:addEntry(data)
-   if ret == nil do print(err) end
+   if ret == nil then print(err) end
    cnt = cnt + 1
 end
 
@@ -66,7 +65,7 @@ while true do
    local timestamp = sock:receive('*l')
    if timestamp == nil then break end
    data = assert(src_db:getEntry(timestamp))
-   dst_db:addEntry(data)
+   assert(dst_db:addEntry(data))
 end
 
 sock:close()