From 1315cac7c303429bdfc56ef061d98b158bf67b4d Mon Sep 17 00:00:00 2001 From: Jeremy Attali Date: Sat, 25 Jan 2014 23:57:37 +0100 Subject: add error string when widget not rendered This prevents the cryptic ruby raw string being printed if no rendering template were found. Closes: #307 --- lib/dashing/app.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/dashing/app.rb') diff --git a/lib/dashing/app.rb b/lib/dashing/app.rb index 033849c..933ef5b 100644 --- a/lib/dashing/app.rb +++ b/lib/dashing/app.rb @@ -117,6 +117,7 @@ get '/views/:widget?.html' do file = File.join(settings.root, "widgets", params[:widget], "#{params[:widget]}.#{suffix}") return engines.first.new(file).render if File.exist? file end + "Drats! Unable to find a widget file named: #{params[:widget]} to render." end def send_event(id, body, target=nil) -- cgit v1.2.3 From 27c6007b0101695241b38853aa60da6ec899fc9f Mon Sep 17 00:00:00 2001 From: David Bishop Date: Mon, 13 Mar 2017 16:06:38 -0600 Subject: Use old-style hash syntax to enable compatibility with ruby 1.8.7 --- lib/dashing/app.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'lib/dashing/app.rb') diff --git a/lib/dashing/app.rb b/lib/dashing/app.rb index 0ff3085..5ee085f 100644 --- a/lib/dashing/app.rb +++ b/lib/dashing/app.rb @@ -34,16 +34,18 @@ set :root, Dir.pwd set :sprockets, Sprockets::Environment.new(settings.root) set :assets_prefix, '/assets' set :digest_assets, false -set server: 'thin', connections: [], history_file: 'history.yml' +set :server, 'thin' +set :connections, [] +set :history_file, 'history.yml' set :public_folder, File.join(settings.root, 'public') set :views, File.join(settings.root, 'dashboards') set :default_dashboard, nil set :auth_token, nil if File.exists?(settings.history_file) - set history: YAML.load_file(settings.history_file) + set :history, YAML.load_file(settings.history_file) else - set history: {} + set :history, {} end %w(javascripts stylesheets fonts images).each do |path| @@ -55,7 +57,7 @@ end end not_found do - send_file File.join(settings.public_folder, '404.html'), status: 404 + send_file File.join(settings.public_folder, '404.html'), :status => 404 end at_exit do @@ -70,7 +72,7 @@ get '/' do redirect "/" + dashboard end -get '/events', provides: 'text/event-stream' do +get '/events', :provides => 'text/event-stream' do protected! response.headers['X-Accel-Buffering'] = 'no' # Disable buffering for nginx stream :keep_open do |out| -- cgit v1.2.3 From 515b1fd3bd1c4f3c782bf81a32435b336f335f80 Mon Sep 17 00:00:00 2001 From: jackhold Date: Sun, 2 Apr 2017 22:32:54 +0200 Subject: Change update time on events Changing from epoch in sec to epoch in milisec --- lib/dashing/app.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/dashing/app.rb') diff --git a/lib/dashing/app.rb b/lib/dashing/app.rb index 0ff3085..7f8a745 100644 --- a/lib/dashing/app.rb +++ b/lib/dashing/app.rb @@ -136,7 +136,7 @@ end def send_event(id, body, target=nil) body[:id] = id - body[:updatedAt] ||= Time.now.to_i + body[:updatedAt] ||= (Time.now.to_f * 1000.0).to_i event = format_event(body.to_json, target) Sinatra::Application.settings.history[id] = event unless target == 'dashboards' Sinatra::Application.settings.connections.each { |out| out << event } -- cgit v1.2.3