hacking on backwards compatibility (6794d4f3) · Commits · github_fork / Clip

lib/fnordmetric.rb

+18 −4

Original line number	Diff line number	Diff line
		@@ -17,6 +17,16 @@ module FnordMetric

		@@firehose = EM::Channel.new

		@@namespaces = {}

		def self.namespace(key=nil, &block)
		@@namespaces[key] = block
		end

		def self.namespaces
		@@namespaces
		end

		def self.backend
		FnordMetric::RedisBackend.new(options)
		end
		@@ -92,14 +102,18 @@ module FnordMetric
		end
		end

		# LEGACY / BACKWARDS COMPATBILE STUFF

		def self.server_configuration=(configuration)
		puts "DEPRECATION WARNING - FIXPAUL"
		self.options=(configuration)
		end

		def self.namespace(*args, &block)
		FnordMetric::Web.namespace(*args, &block)
		def self.standalone
		puts "DEPRECATION WARNING - FIXPAUL"
		FnordMetric::Web.new(
		:host => options[:web_interface][0],
		:port => options[:web_interface][1]
		)
		start_em
		end

		end

+1 −1

Original line number	Diff line number	Diff line
		@@ -43,7 +43,7 @@ class FnordMetric::App < Sinatra::Base
		set :views, ::File.expand_path('../../../../haml', __FILE__)

		def initialize(opts)
		@namespaces = {}
		@namespaces = FnordMetric.namespaces.clone
		@redis = Redis.connect(:url => opts[:redis_url])
		@opts = opts
		namespaces.each do \|key, block\|

+0 −6

Original line number	Diff line number	Diff line
		class FnordMetric::Web

		@@namespaces = {}

		def self.namespace(key=nil, &block)
		@@namespaces[key] = block
		end

		def initialize(opts)
		@opts = opts

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,7 +28,7 @@
		<script>
		//<![CDATA[
		$(document).ready(function(){
		FnordMetric.init($('body'), 'ws://localhost:4243');
		FnordMetric.init($('body'), '$NAMESPACE', 'ws://localhost:4243');
		});
		//]]>
		</script>

+5 −2

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ var FnordMetric = (function(){
		var canvasElem = false;
		var currentView = false;
		var gaugeLoadRunning = false;
		var currentNamespace = false;
		var gauges = {};

		var socket;
		@@ -86,7 +87,9 @@ var FnordMetric = (function(){
		};


		function init(_canvasElem, _sock_addr){
		function init(_canvasElem, _namespace, _sock_addr){
		this.currentNamespace = _namespace;

		canvasElem = $("<div class='viewport_inner'>");
		canvasElem.addClass('clearfix');

		@@ -152,7 +155,7 @@ var FnordMetric = (function(){
		publish: publish,
		p: '',
		socket: socket,
		currentNamespace: false,
		currentNamespace: null,
		currentWidgetUID: 23,
		ui: {},
		views: {},