Skip to content

Commit a3fc343

Browse files
committed
9 Sinatra logger and production env
1 parent 11950d6 commit a3fc343

File tree

6 files changed

+38
-20
lines changed

6 files changed

+38
-20
lines changed

app.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
# -*- coding: utf-8 -*-
22
require 'rubygems'
33
require 'sinatra/base'
4-
require 'sinatra/reloader'
54
require 'fluent-logger'
65
require 'haml'
76
require 'json'
@@ -16,6 +15,11 @@ def initialize(app = nil, params = {})
1615
@fluentd = Fluent::Logger::FluentLogger.open(nil,
1716
host = 'localhost',
1817
port = '29999')
18+
@root = Sinatra::Application.environment == :production ? '/post/' : '/'
19+
end
20+
21+
def logger
22+
env['app.logger'] || env['rack.logger']
1923
end
2024

2125
helpers do

config.ru

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
require 'rubygems'
22
require 'sinatra'
3+
require 'logger'
4+
require './lib/applog'
35
require './app'
46

5-
run FluentdJsonReceiver
7+
logdir = File.dirname(__FILE__) + "/log"
8+
logger = ::Logger.new(logdir + '/app.log')
9+
10+
def logger.write(msg)
11+
self << msg
12+
end
13+
14+
configure :development do
15+
require 'sinatra/reloader'
16+
register Sinatra::Reloader
17+
end
618

19+
configure :production do
20+
end
21+
22+
set :public_dir, File.dirname(__FILE__) + '/public'
23+
use AppLog, logger
24+
use Rack::CommonLogger, logger
25+
26+
run FluentdJsonReceiver

lib/applog.rb

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
class AppLog
2+
def initialize(app, logger)
3+
@app, @logger = app, logger
4+
end
5+
6+
def call(env)
7+
env["app.logger"] = @logger
8+
@app.call(env)
9+
end
10+
end

log/.gitkeep

Whitespace-only changes.

stylesheets/application.scss

Lines changed: 0 additions & 16 deletions
This file was deleted.

views/layout.haml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
!!! 5
2-
%html{html_attrs}
2+
%html
33
%head
44
%meta{:'http-equiv' => "Content-Type", :content => "text/html; charset=utf-8"}
55
%title Fluentd JSON Receiver
6-
%link{:href=>'/stylesheets/application.css', :media => "screen", :rel => 'stylesheet', :type => "text/css"}
6+
%link{:href=> "#{@root}stylesheets/application.css", :media => "screen", :rel => 'stylesheet', :type => "text/css"}
77
%script{:type => "text/javascript", :src => "//ajax.googleapis.com/ajax/libs/jquery/1.10.1/jquery.min.js"}
88
%script{:type => "text/javascript", :src => "/javascripts/application.js"}
99
%body

0 commit comments

Comments
 (0)