From 9ab05ec43e143f6735c59c46bdc70e5675371281 Mon Sep 17 00:00:00 2001 From: amartynov Date: Fri, 21 Nov 2014 12:55:07 +0300 Subject: [PATCH] server version --- devops-service/config.ru | 2 +- devops-service/db/mongo/mongo_connector.rb | 2 +- devops-service/report.rb | 2 +- devops-service/version.rb | 10 ++++++++++ 4 files changed, 13 insertions(+), 3 deletions(-) create mode 100644 devops-service/version.rb diff --git a/devops-service/config.ru b/devops-service/config.ru index 363ad93..d70dbd2 100644 --- a/devops-service/config.ru +++ b/devops-service/config.ru @@ -34,7 +34,7 @@ config[:report_dir_v2] = File.expand_path(File.join(config[:devops_home], "repor run Rack::URLMap.new({ "#{config[:url_prefix]}/v2.0" => DevopsService.new(config), "#{config[:url_prefix]}/client" => Client.new(config), - "#{config[:url_prefix]}/v2.0/report" => Report.new(config, "v2"), + "#{config[:url_prefix]}/v2.0/report" => ReportRoutes.new(config, "v2"), "#{config[:url_prefix]}/sidekiq" => Sidekiq::Web, "#{config[:url_prefix]}/version" => DevopsVersion.new }) diff --git a/devops-service/db/mongo/mongo_connector.rb b/devops-service/db/mongo/mongo_connector.rb index 3aa6375..912833e 100644 --- a/devops-service/db/mongo/mongo_connector.rb +++ b/devops-service/db/mongo/mongo_connector.rb @@ -364,7 +364,7 @@ class MongoConnector def save_report r r.created_at = Time.new - @reports.insert(r.to_hash) + @reports.insert(r.to_mongo_hash) end def reports diff --git a/devops-service/report.rb b/devops-service/report.rb index 66c0456..2dcee47 100644 --- a/devops-service/report.rb +++ b/devops-service/report.rb @@ -1,6 +1,6 @@ require 'sinatra/base' -class Report< Sinatra::Base +class ReportRoutes < Sinatra::Base def initialize config, version super() diff --git a/devops-service/version.rb b/devops-service/version.rb new file mode 100644 index 0000000..10de902 --- /dev/null +++ b/devops-service/version.rb @@ -0,0 +1,10 @@ +require 'sinatra/base' + +class DevopsVersion < Sinatra::Base + + VERSION = "2.0.1" + + get "/" do + VERSION + end +end