bosh-director 1.2765.0 → 1.2768.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28b41e6e8624feb1a4f8a3bbe654cc84f45b0d96
-  data.tar.gz: ed9766fc92fbdc0138263f78c5bac488b575f4da
+  metadata.gz: cca5068f726bfe28b704e1c1e5087cc7d2209051
+  data.tar.gz: aa7060cd4cfb5833944a0f75c9aa10b56c2ea7e8
 SHA512:
-  metadata.gz: 138ceba28cc653b1a64e475b6d5078e2aadcf28422e7272474b5b210ff050b36616a7e8455033569605fd35d5f888168d9227704f5523628d58f888576c72e1e
-  data.tar.gz: a309f8c84ef1a431ee83af55b5c547dcf020fe6c279b352798eebf80a6ef26d6d49b5c860fd4c0867eb5bb5dfa36693953bb4b6f9859257d5a8656ff7c478ce3
+  metadata.gz: 0349f0078e1244e63885899ad5702d24d0414570a8400c6fd8aa91ac3df3a006d6b3277292285777f42c8cfe0aa5040c97daeed91c1705b2f58163760c28b201
+  data.tar.gz: 63b2fdcd8d715b04456792df2255710616f100a86b5b183a50605e7ea8484c216307f7c92e0b0af00f2cafe4c6c04dcaeddb998c3ecc250a8161e94f8445d372

data/bin/bosh-director-worker

@@ -51,10 +51,15 @@ end
 
 Bosh::Director::App.new(config)
 
+logger = Logging::Logger.new('DirectorWorker')
 resque_logging = config.hash.fetch('resque', {}).fetch('logging', {})
-resque_logger_level = resque_logging.fetch('level', 'info').upcase
-Resque.logger = MonoLogger.new(resque_logging.fetch('file', STDOUT))
-Resque.logger.level = MonoLogger.const_get(resque_logger_level)
+if resque_logging.has_key?('file')
+  logger.add_appenders(Logging.appenders.file('DirectorWorkerFile', filename: resque_logging.fetch('file')))
+else
+  logger.add_appenders(Logging.appenders.stdout('DirectorWorkerIO'))
+end
+logger.level = Logging.levelify(resque_logging.fetch('level', 'info'))
+Resque.logger = logger
 
 worker = nil
 queues = (ENV['QUEUES'] || ENV['QUEUE']).to_s.split(',')

data/lib/bosh/director.rb

@@ -10,8 +10,8 @@ require 'erb'
 require 'fileutils'
 require 'forwardable'
 require 'logger'
+require 'logging'
 require 'monitor'
-require 'mono_logger'
 require 'optparse'
 require 'ostruct'
 require 'pathname'

data/lib/bosh/director/api/task_helper.rb

@@ -1,4 +1,3 @@
-# Copyright (c) 2009-2012 VMware, Inc.
 require 'bosh/director/api/task_remover'
 
 module Bosh::Director
@@ -15,7 +14,9 @@ module Bosh::Director
         log_dir = File.join(Config.base_dir, "tasks", task.id.to_s)
         task_status_file = File.join(log_dir, "debug")
         FileUtils.mkdir_p(log_dir)
-        logger = MonoLogger.new(task_status_file)
+
+        logger = Logging::Logger.new('DirectorTask')
+        logger.add_appenders(Logging.appenders.file('DirectorTaskFile', filename: task_status_file))
         logger.level = Config.logger.level
         logger.info("Director Version : #{Bosh::Director::VERSION}")
         logger.info("Enqueuing task: #{task.id}")

data/lib/bosh/director/config.rb

@@ -1,6 +1,5 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 require 'fileutils'
+require 'logging'
 
 module Bosh::Director
 
@@ -73,16 +72,31 @@ module Bosh::Director
         # checkpoint task progress every 30 secs
         @task_checkpoint_interval = 30
 
-        logging = config.fetch('logging', {})
-        @log_device = MonoLogger::LocklessLogDevice.new(logging.fetch('file', STDOUT))
-        @logger = MonoLogger.new(@log_device)
-        @logger.level = Logger.const_get(logging.fetch('level', 'debug').upcase)
-        @logger.formatter = ThreadFormatter.new
+        logging_config = config.fetch('logging', {})
+        if logging_config.has_key?('file')
+          @log_file_path = logging_config.fetch('file')
+          shared_appender = Logging.appenders.file(
+            'DirectorLogFile',
+            filename: @log_file_path,
+            layout: ThreadFormatter.layout
+          )
+        else
+          shared_appender = Logging.appenders.io(
+            'DirectorStdOut',
+            STDOUT,
+            layout: ThreadFormatter.layout
+          )
+        end
+
+        @logger = Logging::Logger.new('Director')
+        @logger.add_appenders(shared_appender)
+        @logger.level = Logging.levelify(logging_config.fetch('level', 'debug'))
 
-        # use a separate logger for redis to make it stfu
-        redis_logger = MonoLogger.new(@log_device)
-        logging = config.fetch('redis', {}).fetch('logging', {})
-        @redis_logger_level = Logger.const_get(logging.fetch('level', 'info').upcase)
+        # use a separate logger with the same appender to avoid multiple file writers
+        redis_logger = Logging::Logger.new('DirectorRedis')
+        redis_logger.add_appenders(shared_appender)
+        logging_config = config.fetch('redis', {}).fetch('logging', {})
+        @redis_logger_level = Logging.levelify(logging_config.fetch('level', 'info'))
         redis_logger.level = @redis_logger_level
 
         # Event logger supposed to be overridden per task,
@@ -137,7 +151,7 @@ module Bosh::Director
       end
 
       def log_dir
-        File.dirname(@log_device.filename) if @log_device.filename
+        File.dirname(@log_file_path) if @log_file_path
       end
 
       def use_compiled_package_cache?

data/lib/bosh/director/deployment_plan/assembler.rb

@@ -346,7 +346,7 @@ module Bosh::Director
       end
 
       @event_log.begin_stage('Deleting unneeded VMs', unneeded_vms.size)
-      ThreadPool.new(:max_threads => Config.max_threads).wrap do |pool|
+      ThreadPool.new(max_threads: Config.max_threads, logger: @logger).wrap do |pool|
         unneeded_vms.each do |vm_model|
           pool.process do
             @event_log.track(vm_model.cid) do

data/lib/bosh/director/event_log.rb

@@ -24,7 +24,21 @@ module Bosh::Director
 
     class Log
       def initialize(io = nil)
-        @logger = CustomLogger.new(io || StringIO.new)
+        @logger = Logging::Logger.new('EventLog')
+        if io.is_a?(String)
+          @logger.add_appenders(Logging.appenders.file(
+            'EventFile',
+            filename: io,
+            layout: Logging.layouts.pattern(:pattern => '%m\n')
+          ))
+        else
+          @logger.add_appenders(Logging.appenders.io(
+            'EventIO',
+            io || StringIO.new,
+            layout: Logging.layouts.pattern(:pattern => '%m\n')
+          ))
+        end
+
         @last_stage = Stage.new(self, 'unknown', [], 0)
       end
 
@@ -143,11 +157,5 @@ module Bosh::Director
         @stage.log_entry(task_entry)
       end
     end
-
-    class CustomLogger < ::Logger
-      def format_message(level, time, progname, msg)
-        msg + "\n"
-      end
-    end
   end
 end

data/lib/bosh/director/job_runner.rb

@@ -53,19 +53,23 @@ module Bosh::Director
       event_log = File.join(log_dir, 'event')
       result_log = File.join(log_dir, 'result')
 
-      debug_log_device = MonoLogger::LocklessLogDevice.new(debug_log)
-
-      @task_logger = MonoLogger.new(debug_log_device)
+      @task_logger = Logging::Logger.new('DirectorJobRunner')
+      shared_appender = Logging.appenders.file(
+        'DirectorJobRunnerFile',
+        filename: debug_log,
+        layout: ThreadFormatter.layout
+      )
+      @task_logger.add_appenders(shared_appender)
       @task_logger.level = Config.logger.level
-      @task_logger.formatter = ThreadFormatter.new
 
       Config.event_log = EventLog::Log.new(event_log)
       Config.result = TaskResultFile.new(result_log)
       Config.logger = @task_logger
 
-      redis_task_logger = MonoLogger.new(debug_log_device)
+      # use a separate logger with the same appender to avoid multiple file writers
+      redis_task_logger = Logging::Logger.new('DirectorJobRunnerRedis')
+      redis_task_logger.add_appenders(shared_appender)
       redis_task_logger.level = Config.redis_logger_level
-      redis_task_logger.formatter = ThreadFormatter.new
       Config.redis_logger = redis_task_logger
 
       Config.db.logger = @task_logger

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2765.0'
+    VERSION = '1.2768.0'
   end
 end

data/lib/cloud/dummy.rb

@@ -1,7 +1,6 @@
 require 'digest/sha1'
 require 'fileutils'
 require 'securerandom'
-require 'mono_logger'
 
 module Bosh
   module Clouds
@@ -20,7 +19,11 @@ module Bosh
 
         @running_vms_dir = File.join(@base_dir, 'running_vms')
 
-        @logger = MonoLogger.new(options['log_device'] || STDOUT)
+        @logger = Logging::Logger.new('DummyCPI')
+        @logger.add_appenders(Logging.appenders.io(
+          'DummyCPIIO',
+          options['log_buffer'] || STDOUT
+        ))
 
         @commands = CommandTransport.new(@base_dir, @logger)
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2765.0
+  version: 1.2768.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -30,140 +30,140 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
 - !ruby/object:Gem::Dependency
   name: bosh_warden_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2765.0
+        version: 1.2768.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -221,19 +221,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: mono_logger
+  name: logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: nats
   requirement: !ruby/object:Gem::Requirement
@@ -460,7 +460,7 @@ dependencies:
         version: '0'
 description: |-
   BOSH Director
-  ae0a5a
+  2b24dc
 email: support@cloudfoundry.com
 executables:
 - bosh-director