Cleanup trailing whitespace

This commit is contained in:
Tom Hughes 2015-02-16 18:52:25 +00:00
parent e1f79d84ad
commit 34e3e51456
129 changed files with 1056 additions and 1076 deletions

View file

@ -4,7 +4,7 @@ if defined?(ActiveRecord::ConnectionAdaptors::AbstractAdapter)
class AbstractAdapter
protected
alias_method :old_log, :log
def log(sql, name)
if block_given?
old_log(sql, name) do

View file

@ -1,7 +1,7 @@
# Configure ActionMailer SMTP settings
ActionMailer::Base.smtp_settings = {
:address => 'localhost',
:port => 25,
:port => 25,
:domain => 'localhost',
:enable_starttls_auto => false
}

View file

@ -11,16 +11,16 @@ if defined?(SOFT_MEMORY_LIMIT) and defined?(PhusionPassenger)
def initialize(app)
@app = app
end
def call(env)
# Process this requst
status, headers, body = @app.call(env)
# Restart if we've hit our memory limit
if resident_size > SOFT_MEMORY_LIMIT
Process.kill("USR1", Process.pid)
end
# Return the result of this request
[status, headers, body]
end
@ -31,7 +31,7 @@ if defined?(SOFT_MEMORY_LIMIT) and defined?(PhusionPassenger)
fields = File.open("/proc/self/statm") do |file|
fields = file.gets.split(" ")
end
# Return resident size in megabytes
return fields[1].to_i / 256
end

View file

@ -12,7 +12,7 @@ class R2Template < Tilt::Template
def prepare
@output = R2.r2(data)
end
def evaluate(scope, locals, &block)
@output
end

View file

@ -78,7 +78,7 @@ OpenStreetMap::Application.routes.draw do
match 'api/0.6/gpx/:id' => 'trace#api_delete', :via => :delete, :id => /\d+/
match 'api/0.6/gpx/:id/details' => 'trace#api_read', :via => :get, :id => /\d+/
match 'api/0.6/gpx/:id/data' => 'trace#api_data', :via => :get
# AMF (ActionScript) API
match 'api/0.6/amf/read' => 'amf#amf_read', :via => :post
match 'api/0.6/amf/write' => 'amf#amf_write', :via => :post