diff options
| author | Christian Pointner <equinox@helsinki.at> | 2011-03-29 15:43:47 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2011-03-29 15:43:47 (GMT) |
| commit | 90d86556d7bcf29964f4c73b72ce47bcda7543aa (patch) | |
| tree | 1fb72b9f6344828ee1359302fe4f9b73928d9ff4 | |
| parent | 27a967a7fbbd9345bf205e44bbfd047f5752a42e (diff) | |
small cleanup
| -rw-r--r-- | nopsyncd/conf.lua | 2 | ||||
| -rw-r--r-- | nopsyncd/nopsyncd.conf | 8 | ||||
| -rwxr-xr-x | nopsyncd/tcpserver.lua | 6 |
3 files changed, 8 insertions, 8 deletions
diff --git a/nopsyncd/conf.lua b/nopsyncd/conf.lua index 83257b5..ee5487d 100644 --- a/nopsyncd/conf.lua +++ b/nopsyncd/conf.lua @@ -21,7 +21,7 @@ local conf = {} -local file = assert(io.open("nopsyncd.conf", "r")) +local file = assert(io.open("/etc/rhnop/nopsyncd.conf", "r")) for line in file:lines() do local k,v = string.match(line, "^([^=#]+)=(.*)$") if k and v and v ~= "" then diff --git a/nopsyncd/nopsyncd.conf b/nopsyncd/nopsyncd.conf index 636e4f0..cf324e7 100644 --- a/nopsyncd/nopsyncd.conf +++ b/nopsyncd/nopsyncd.conf @@ -3,11 +3,11 @@ queue_name=/rhnop rddb_db=rivendell rddb_host=127.0.0.1 #rddb_port=3306 -rddb_user=rivendellro -rddb_pwd=lldrivenro +rddb_user= +rddb_pwd= playlog_db=rhnop playlog_host=127.0.0.1 #playlog_port=3307 -playlog_user=nopsyncd -playlog_pwd=123456 +playlog_user= +playlog_pwd= diff --git a/nopsyncd/tcpserver.lua b/nopsyncd/tcpserver.lua index dd6f18b..3b4c777 100755 --- a/nopsyncd/tcpserver.lua +++ b/nopsyncd/tcpserver.lua @@ -34,7 +34,7 @@ end local clients = {} function add_client(hdl) - print("new client(" .. hdl:getfd() .. ") from " .. hdl:getpeername()) + -- print("new client(" .. hdl:getfd() .. ") from " .. hdl:getpeername()) local client = {} client.buffer = "" client.hdl = hdl @@ -51,7 +51,7 @@ function remove_client(c) end end - print("removing client(" .. c.hdl:getfd() .. ")") + -- print("removing client(" .. c.hdl:getfd() .. ")") c.hdl:close() table.remove(clients, idx) end @@ -96,7 +96,7 @@ function main_loop() if timestamp == nil then return 2 end - print("pipe was signaled with timestamp: " .. timestamp) + -- print("pipe was signaled with timestamp: " .. timestamp) clients_senddata(timestamp) elseif input == server then local client = assert(server:accept()) |