From 76285091613959e81ee8c1eca8d224d592474d95 Mon Sep 17 00:00:00 2001 From: Azul Date: Sat, 23 Nov 2013 10:23:57 +0100 Subject: Revert "couch-doc-update: log errors to stderr and syslog (#4225)" This reverts commit d3153dd2da619035c0504b02f478796d656bb11d. --- files/couch-doc-update | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'files') diff --git a/files/couch-doc-update b/files/couch-doc-update index c95278f..7cc5799 100644 --- a/files/couch-doc-update +++ b/files/couch-doc-update @@ -1,5 +1,4 @@ #!/usr/bin/ruby -require 'syslog' # # This script will update the values of a particular couchdb document. The benefit of this little script over @@ -38,10 +37,7 @@ def main exit 0 if result['ok'] raise StandardError.new(result.inspect) rescue StandardError => exc - $stderr.puts "ERROR: " + exc.to_s - Syslog.open do |logger| - logger.log(Syslog::LOG_CRIT, exc.to_s) - end + puts "ERROR: " + exc.to_s exit 1 end @@ -105,8 +101,8 @@ def connection_string(database, host) protocol = "http" #hostname = "127.0.0.1" port = "5984" - # username = "admin" - # password = "" + username = "admin" + password = "" netrc = File.read('/etc/couchdb/couchdb.netrc') netrc.scan(/\w+ [\w\.]+/).each do |key_value| @@ -120,8 +116,7 @@ def connection_string(database, host) host ||= '127.0.0.1:5984' - puts "%s://%s/%s" % [protocol, host, database] - "%s://%s/%s" % [protocol, host, database] + "%s://%s:%s@%s/%s" % [protocol, username, password, host, database] end def usage(s) -- cgit v1.2.3