puppet-forge-server 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7534f17808255a66c9f45677758540784f88dd49
-  data.tar.gz: 45e2900ea2f35918116c89b813dfa7465a713f41
+  metadata.gz: 973bfb424267e3db596e1568f4781d7ef102e46a
+  data.tar.gz: aaaba8e6de5e1a55e7842e92b28caab624df37c1
 SHA512:
-  metadata.gz: 4edc8df5081d8244aac83af9a3064a8787ce1d57b023a8b5f90125e440407e3650f2010fa560caabcb46dacce974abb56dde156ae348b792d959cb1b6a7dce1e
-  data.tar.gz: 995943485154d7772395495fcb91b162629491e4ba0e7f98a429847f9fe2ae5eaeef8d68170e6318dc23074eaee805f0d1c94be6faca8457a4f5032671e49087
+  metadata.gz: e01143d845d1c664ff7490ac231cae20e0616de8dcad0ccd745695c04279384763433b3b998bba6546dc57e634d0dcf6f9bb98d045704f55d1f6ec982bac7a09
+  data.tar.gz: be411f8e681736089b3026ba66f1a7c132b75f338f8dd02fca8fa5c8c831af3a404461ef66c99ff12826c72134165fa091ce29c4c2e95e2fc06c7f8b75ce4e5c

data/lib/puppet_forge_server.rb

@@ -20,6 +20,7 @@ require 'puppet_forge_server/version'
 module PuppetForgeServer
   autoload :Server, 'puppet_forge_server/server'
   autoload :Errors, 'puppet_forge_server/errors'
+  autoload :Logger, 'puppet_forge_server/logger'
 
   module Api
     module V1

data/lib/puppet_forge_server/app/version1.rb

@@ -23,6 +23,14 @@ module PuppetForgeServer::App
     include PuppetForgeServer::Api::V1::Modules
     include PuppetForgeServer::Utils::Buffer
 
+    configure do
+      use ::Rack::CommonLogger, PuppetForgeServer::Logger.get(:access)
+    end
+
+    before {
+      env['rack.errors'] =  PuppetForgeServer::Logger.get(:server)
+    }
+
     def initialize(backends)
       super(nil)
       @backends = backends

data/lib/puppet_forge_server/app/version3.rb

@@ -22,6 +22,14 @@ module PuppetForgeServer::App
     include PuppetForgeServer::Api::V3::Modules
     include PuppetForgeServer::Utils::Buffer
 
+    configure do
+      use ::Rack::CommonLogger, PuppetForgeServer::Logger.get(:access)
+    end
+
+    before {
+      env['rack.errors'] =  PuppetForgeServer::Logger.get(:server)
+    }
+
     def initialize(backends)
       super(nil)
       @backends = backends

data/lib/puppet_forge_server/logger.rb

@@ -0,0 +1,56 @@
+# -*- encoding: utf-8 -*-
+#
+# Copyright 2014 North Development AB
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+require 'logger'
+
+module PuppetForgeServer
+  class Logger
+    @@DEFAULT_DESTINATION = STDERR
+    @@DEFAULT_DATETIME_FORMAT = '%Y-%m-%d %H:%M:%S'
+    @static_loggers = {:server => nil, :access => nil}
+
+    def initialize(destinations = [@@DEFAULT_LOGGER])
+      @loggers = Array.new(destinations).flatten.map do |dest|
+        logger = ::Logger.new(dest)
+        logger.formatter = proc do |severity, datetime, progname, msg|
+          datetime = datetime.strftime @@DEFAULT_DATETIME_FORMAT
+          "[#{datetime}] #{severity}  #{msg}\n"
+        end
+        logger
+      end
+    end
+
+    def method_missing (method_name, *args, &block)
+      method_name = method_name == :write ? :'<<' : method_name
+      @loggers.each { |logger| logger.send(method_name, args.first) }
+    end
+
+    class << self
+      def get(type = :server)
+        set unless @static_loggers[type]
+        @static_loggers[type]
+      end
+
+      def set(loggers= {})
+        loggers = {:server => [@@DEFAULT_DESTINATION], :access => [@@DEFAULT_DESTINATION]}.merge(loggers)
+        loggers.each do |type, destinations|
+          @static_loggers[type] = PuppetForgeServer::Logger.new(destinations)
+        end
+      end
+    end
+  end
+end

data/lib/puppet_forge_server/server.rb

@@ -21,40 +21,49 @@ module PuppetForgeServer
     include PuppetForgeServer::Utils::OptionParser
     include PuppetForgeServer::Utils::Http
 
-    def initialize(log = STDERR)
-      @log = log
-    end
-
     def go(args)
       begin
         options = parse_options(args)
+        @log = logging(options)
         backends = backends(options)
         server = build(backends)
         announce(options, backends)
         start(server, options)
       rescue PuppetForgeServer::Errors::Expected
-        @log.puts "Error: #{error}"
+        @log.error error
+      end
+    end
+
+    def logging(options)
+      if options[:log_dir]
+        FileUtils.mkdir_p options[:log_dir]
+        server_loggers = [File.join(options[:log_dir], 'server.log')]
+        server_loggers << STDERR if options[:debug]
+        access_loggers = [File.join(options[:log_dir], 'access.log')]
+        access_loggers << STDERR if options[:debug]
+        PuppetForgeServer::Logger.set({:server => server_loggers, :access => access_loggers})
       end
+      PuppetForgeServer::Logger.get
     end
 
     def build(backends)
       Rack::Mount::RouteSet.new do |set|
         set.add_route PuppetForgeServer::App::Version1.new(backends)
-        set.add_route ::PuppetForgeServer::App::Version3.new(backends)
+        set.add_route PuppetForgeServer::App::Version3.new(backends)
       end
     end
 
     def announce(options, backends)
       options = options.clone
       options.default = 'default'
-      @log.puts " +- Daemonizing: #{options[:daemonize]}"
-      @log.puts " |- Port: #{options[:port]}"
-      @log.puts " |- Host: #{options[:hostname]}"
-      @log.puts " |- Pidfile: #{options[:pidfile]}" if options[:pidfile]
-      @log.puts " |- Server: #{options[:server]}"
-      @log.puts ' `- Backends:'
+      @log.info " +- Daemonizing: #{options[:daemonize]}"
+      @log.info " |- Port: #{options[:port]}"
+      @log.info " |- Host: #{options[:hostname]}"
+      @log.info " |- Pidfile: #{options[:pidfile]}" if options[:pidfile]
+      @log.info " |- Server: #{options[:server]}"
+      @log.info ' `- Backends:'
       backends.each do |backend|
-        @log.puts "    - #{backend.inspect}"
+        @log.info "    - #{backend.inspect}"
       end
     end
 
@@ -76,7 +85,7 @@ module PuppetForgeServer
         typed_backends.map do |url|
           case type
             when 'Proxy'
-              @log.puts "Detecting API version for #{url}..."
+              @log.info "Detecting API version for #{url}..."
               PuppetForgeServer::Backends.const_get("#{type}V#{get_api_version(url)}").new(url.chomp('/'), options[:cache_basedir])
             else
               PuppetForgeServer::Backends.const_get(type).new(url)

data/lib/puppet_forge_server/utils/option_parser.rb

@@ -26,6 +26,7 @@ module PuppetForgeServer::Utils
     @@DEFAULT_PORT = 8080
     @@DEFAULT_PID_FILE = File.join(Dir.tmpdir.to_s, 'puppet-forge-server', 'server.pid')
     @@DEFAULT_CACHE_DIR = File.join(Dir.tmpdir.to_s, 'puppet-forge-server', 'cache')
+    @@DEFAULT_LOG_DIR = File.join(Dir.tmpdir.to_s, 'puppet-forge-server', 'log')
 
     def parse_options(args)
       options = {:daemonize => @@DEFAULT_DAEMONIZE, :cache_basedir => @@DEFAULT_CACHE_DIR, :port => @@DEFAULT_PORT}
@@ -43,7 +44,6 @@ module PuppetForgeServer::Utils
 
         opts.on('-D', '--daemonize', "Run the server in the background (default: #{@@DEFAULT_DAEMONIZE})") do
           options[:daemonize] = true
-          options[:pidfile] = @@DEFAULT_PID_FILE unless options[:pidfile]
         end
 
         opts.on('--pidfile FILE', 'Write a pidfile to this location after starting') do |pidfile|
@@ -61,12 +61,31 @@ module PuppetForgeServer::Utils
         opts.on('--cache-basedir DIR', "Cache all proxies' downloaded modules under this directory (default: #{@@DEFAULT_CACHE_DIR})") do |cache_basedir|
           options[:cache_basedir] = cache_basedir
         end
+
+        opts.on('--log-dir DIR', "Directory containing all server logs (if daemonized default: #{@@DEFAULT_LOG_DIR})") do |log_dir|
+          options[:log_dir] = log_dir
+        end
+
+        opts.on('--debug', 'Log everything into STDERR') do
+          options[:debug] = true
+        end
       end
       begin
         option_parser.parse(args)
       rescue ::OptionParser::InvalidOption => parse_error
         raise PuppetForgeServer::Errors::Expected, parse_error.message + "\n" + option_parser.help
       end
+
+      # Handle option dependencies
+      if options[:daemonize]
+        options[:pidfile] = @@DEFAULT_PID_FILE unless options[:pidfile]
+        options[:log_dir] = @@DEFAULT_LOG_DIR unless options[:log_dir]
+      end
+
+      if options[:log_dir] && !options[:daemonize]
+        options[:debug] = true
+      end
+
       return options
     end
   end

data/lib/puppet_forge_server/version.rb

@@ -15,5 +15,5 @@
 # limitations under the License.
 
 module PuppetForgeServer
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppet-forge-server
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Ilja Bobkevic
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-12 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra
@@ -134,6 +134,7 @@ files:
 - lib/puppet_forge_server/backends/proxy_v3.rb
 - lib/puppet_forge_server/errors.rb
 - lib/puppet_forge_server/http/http_client.rb
+- lib/puppet_forge_server/logger.rb
 - lib/puppet_forge_server/models/builder.rb
 - lib/puppet_forge_server/models/metadata.rb
 - lib/puppet_forge_server/patches.rb