API tools faq
paste
Guest User

Untitled

a guest
Apr 17th, 2018
231
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 14.06 KB | None | 0 0
raw download clone embed print report
  1. Only in evented-starling/: .DS_Store
  2. diff -u -r evented-starling/.git/config britted-starling/.git/config
  3. --- evented-starling/.git/config 2008-02-07 11:39:59.000000000 -0800
  4. +++ britted-starling/.git/config 2008-02-08 18:35:04.000000000 -0800
  5. @@ -4,7 +4,7 @@
  6. bare = false
  7. logallrefupdates = true
  8. [remote "origin"]
  9. - url = git://github.com/defunkt/starling.git
  10. + url = git://github.com/anotherbritt/starling.git
  11. fetch = +refs/heads/*:refs/remotes/origin/*
  12. [branch "master"]
  13. remote = origin
  14. Binary files evented-starling/.git/index and britted-starling/.git/index differ
  15. diff -u -r evented-starling/.git/logs/HEAD britted-starling/.git/logs/HEAD
  16. --- evented-starling/.git/logs/HEAD 2008-02-07 11:39:59.000000000 -0800
  17. +++ britted-starling/.git/logs/HEAD 2008-02-08 18:35:04.000000000 -0800
  18. @@ -1 +1 @@
  19. -0000000000000000000000000000000000000000 3ac7b46d69527f5d2e3b1a52b40915ff24a8e28a Evan Weaver <weavere@c13-chd-dev1.cnet.com> 1202413199 -0800
  20. +0000000000000000000000000000000000000000 4ab87b48517db49c45c21b3f4307610a0dc544ef Evan Weaver <weavere@c13-chd-dev1.cnet.com> 1202524504 -0800
  21. diff -u -r evented-starling/.git/logs/refs/heads/master britted-starling/.git/logs/refs/heads/master
  22. --- evented-starling/.git/logs/refs/heads/master 2008-02-07 11:39:59.000000000 -0800
  23. +++ britted-starling/.git/logs/refs/heads/master 2008-02-08 18:35:04.000000000 -0800
  24. @@ -1 +1 @@
  25. -0000000000000000000000000000000000000000 3ac7b46d69527f5d2e3b1a52b40915ff24a8e28a Evan Weaver <weavere@c13-chd-dev1.cnet.com> 1202413199 -0800
  26. +0000000000000000000000000000000000000000 4ab87b48517db49c45c21b3f4307610a0dc544ef Evan Weaver <weavere@c13-chd-dev1.cnet.com> 1202524504 -0800
  27. diff -u -r evented-starling/.git/logs/refs/remotes/origin/master britted-starling/.git/logs/refs/remotes/origin/master
  28. --- evented-starling/.git/logs/refs/remotes/origin/master 2008-02-07 11:39:59.000000000 -0800
  29. +++ britted-starling/.git/logs/refs/remotes/origin/master 2008-02-08 18:35:04.000000000 -0800
  30. @@ -1 +1 @@
  31. -0000000000000000000000000000000000000000 3ac7b46d69527f5d2e3b1a52b40915ff24a8e28a Evan Weaver <weavere@c13-chd-dev1.cnet.com> 1202413199 -0800 clone: from git://github.com/defunkt/starling.git
  32. +0000000000000000000000000000000000000000 4ab87b48517db49c45c21b3f4307610a0dc544ef Evan Weaver <weavere@c13-chd-dev1.cnet.com> 1202524504 -0800 clone: from git://github.com/anotherbritt/starling.git
  33. Only in britted-starling/.git/objects/pack: pack-c94afa33c0e9f9d62e2a0ca3be4e4bcfa2335112.idx
  34. Only in britted-starling/.git/objects/pack: pack-c94afa33c0e9f9d62e2a0ca3be4e4bcfa2335112.keep
  35. Only in britted-starling/.git/objects/pack: pack-c94afa33c0e9f9d62e2a0ca3be4e4bcfa2335112.pack
  36. Only in evented-starling/.git/objects/pack: pack-e8eeccdbdbed58a21f0fe9f1aa5e66f68cfa9e5f.idx
  37. Only in evented-starling/.git/objects/pack: pack-e8eeccdbdbed58a21f0fe9f1aa5e66f68cfa9e5f.keep
  38. Only in evented-starling/.git/objects/pack: pack-e8eeccdbdbed58a21f0fe9f1aa5e66f68cfa9e5f.pack
  39. diff -u -r evented-starling/.git/refs/heads/master britted-starling/.git/refs/heads/master
  40. --- evented-starling/.git/refs/heads/master 2008-02-07 11:39:59.000000000 -0800
  41. +++ britted-starling/.git/refs/heads/master 2008-02-08 18:35:04.000000000 -0800
  42. @@ -1 +1 @@
  43. -3ac7b46d69527f5d2e3b1a52b40915ff24a8e28a
  44. +4ab87b48517db49c45c21b3f4307610a0dc544ef
  45. diff -u -r evented-starling/.git/refs/remotes/origin/master britted-starling/.git/refs/remotes/origin/master
  46. --- evented-starling/.git/refs/remotes/origin/master 2008-02-07 11:39:59.000000000 -0800
  47. +++ britted-starling/.git/refs/remotes/origin/master 2008-02-08 18:35:04.000000000 -0800
  48. @@ -1 +1 @@
  49. -3ac7b46d69527f5d2e3b1a52b40915ff24a8e28a
  50. +4ab87b48517db49c45c21b3f4307610a0dc544ef
  51. diff -u -r evented-starling/lib/starling/handler.rb britted-starling/lib/starling/handler.rb
  52. --- evented-starling/lib/starling/handler.rb 2008-02-07 11:39:59.000000000 -0800
  53. +++ britted-starling/lib/starling/handler.rb 2008-02-08 18:35:04.000000000 -0800
  54. @@ -49,6 +49,7 @@
  55. STAT queue_%s_logsize %d
  56. STAT queue_%s_expired_items %d\n".freeze
  57.  
  58. + @@cc = 0
  59. ##
  60. # Creates a new handler for the MemCache protocol that communicates with a
  61. # given client.
  62. @@ -63,7 +64,9 @@
  63. def post_init
  64. @stash = []
  65. @data = ""
  66. + @data_buf = ""
  67. @server = @opts[:server]
  68. + @logger = StarlingServer::Base.logger
  69. @expiry_stats = Hash.new(0)
  70. @expected_length = nil
  71. @server.stats[:total_connections] += 1
  72. @@ -79,15 +82,20 @@
  73. response = process(data)
  74. end
  75.  
  76. + @@cc = @@cc+1
  77. send_data response if response
  78. end
  79.  
  80. def process(data)
  81. + data = @data_buf + data if @data_buf.size > 0
  82. # our only non-normal state is consuming an object's data
  83. # when @expected_length is present
  84. if @expected_length && data.size == @expected_length
  85. - return set_data(data)
  86. + response = set_data(data)
  87. + @data_buf = ""
  88. + return response
  89. elsif @expected_length
  90. + @data_buf = data
  91. return
  92. end
  93.  
  94. @@ -126,13 +134,16 @@
  95. def set_data(incoming)
  96. key, flags, expiry = @stash
  97. data = incoming.slice(0...@expected_length-2)
  98. + logger.info "[loltrace] [q: #{key}] [m:set_data got data] #{data.inspect}" if data.include?('loltrace')
  99. @stash = []
  100. @expected_length = nil
  101.  
  102. internal_data = [expiry.to_i, data].pack(DATA_PACK_FMT)
  103. if @queue_collection.put(key, internal_data)
  104. + logger.info "[loltrace] [q: #{key}] [m:set_data sending success] #{data.inspect}" if data.include?('loltrace')
  105. respond SET_RESPONSE_SUCCESS
  106. else
  107. + logger.info "[loltrace] [q: #{key}] [m:set_data sending failure] #{data.inspect}" if data.include?('loltrace')
  108. respond SET_RESPONSE_FAILURE
  109. end
  110. end
  111. @@ -142,6 +153,7 @@
  112.  
  113. while response = @queue_collection.take(key)
  114. expiry, data = response.unpack(DATA_PACK_FMT)
  115. + logger.info "[loltrace] [q: #{key}] [m:get got data with expiry #{expiry}] #{data.inspect}" if data.include?('loltrace')
  116.  
  117. break if expiry == 0 || expiry >= now
  118.  
  119. @@ -150,6 +162,7 @@
  120. end
  121.  
  122. if data
  123. + logger.info "[loltrace] [q: #{key}] [m:get sending success] #{data.inspect}" if data.include?('loltrace')
  124. respond GET_RESPONSE, key, 0, data.size, data
  125. else
  126. respond GET_RESPONSE_EMPTY
  127. @@ -190,7 +203,7 @@
  128. end
  129.  
  130. def logger
  131. - @server.logger
  132. + @logger
  133. end
  134. end
  135. end
  136. diff -u -r evented-starling/lib/starling/queue_collection.rb britted-starling/lib/starling/queue_collection.rb
  137. --- evented-starling/lib/starling/queue_collection.rb 2008-02-07 11:39:59.000000000 -0800
  138. +++ britted-starling/lib/starling/queue_collection.rb 2008-02-08 18:35:04.000000000 -0800
  139. @@ -21,6 +21,7 @@
  140. @shutdown_mutex = Mutex.new
  141.  
  142. @path = path
  143. + @logger = StarlingServer::Base.logger
  144.  
  145. @queues = {}
  146. @queue_init_mutexes = {}
  147. @@ -39,6 +40,7 @@
  148. @stats[:total_items] += 1
  149.  
  150. queue.push(data)
  151. + @logger.info "[loltrace] [q: #{key}] [m:queue_push] #{data.inspect}" if data.include?('loltrace')
  152.  
  153. return true
  154. end
  155. diff -u -r evented-starling/lib/starling/runner.rb britted-starling/lib/starling/runner.rb
  156. --- evented-starling/lib/starling/runner.rb 2008-02-07 11:39:59.000000000 -0800
  157. +++ britted-starling/lib/starling/runner.rb 2008-02-08 18:35:04.000000000 -0800
  158. @@ -14,7 +14,7 @@
  159. def initialize
  160. parse_options
  161.  
  162. - @process = ProcessHelper.new(options[:log_file], options[:pid_file], options[:user], options[:group])
  163. + @process = ProcessHelper.new(options[:logger], options[:pid_file], options[:user], options[:group])
  164.  
  165. pid = @process.running?
  166. if pid
  167. @@ -31,7 +31,7 @@
  168. self.options = { :host => '127.0.0.1',
  169. :port => 22122,
  170. :path => File.join(%w( / var spool starling )),
  171. - :log_level => 0,
  172. + :log_level => Logger::ERROR,
  173. :daemonize => false,
  174. :pid_file => File.join(%w( / var run starling.pid )) }
  175.  
  176. @@ -83,11 +83,11 @@
  177. opts.separator ""; opts.separator "Logging:"
  178.  
  179. opts.on("-l", "--log [FILE]", "Path to print debugging information.") do |log_path|
  180. - options[:log] = log_path
  181. + options[:logger] = log_path
  182. end
  183.  
  184. - opts.on("-v", "Increase logging verbosity.") do
  185. - options[:log_level] += 1
  186. + opts.on("-v", "Increase logging verbosity (may be used multiple times).") do
  187. + options[:log_level] -= 1
  188. end
  189.  
  190. opts.separator ""; opts.separator "Miscellaneous:"
  191. @@ -127,7 +127,7 @@
  192. def shutdown
  193. begin
  194. STDOUT.puts "Shutting down."
  195. - @server.logger.info "Shutting down."
  196. + StarlingServer::Base.logger.info "Shutting down."
  197. @server.stop
  198. rescue Object => e
  199. STDERR.puts "There was an error shutting down: #{e}"
  200. diff -u -r evented-starling/lib/starling/server.rb britted-starling/lib/starling/server.rb
  201. --- evented-starling/lib/starling/server.rb 2008-02-07 11:39:59.000000000 -0800
  202. +++ britted-starling/lib/starling/server.rb 2008-02-08 18:35:04.000000000 -0800
  203. @@ -2,6 +2,7 @@
  204. require 'logger'
  205. require 'rubygems'
  206. require 'eventmachine'
  207. +require 'analyzer_tools/syslog_logger'
  208.  
  209. here = File.dirname(__FILE__)
  210.  
  211. @@ -10,7 +11,7 @@
  212.  
  213. module StarlingServer
  214.  
  215. - VERSION = "0.9.4"
  216. + VERSION = "0.9.5.1"
  217.  
  218. class Base
  219. attr_reader :logger
  220. @@ -64,14 +65,14 @@
  221. def run
  222. @stats[:start_time] = Time.now
  223.  
  224. - @logger = case @opts[:logger]
  225. - when IO, String; Logger.new(@opts[:logger])
  226. + @@logger = case @opts[:logger]
  227. + when IO, String; SyslogLogger.new(@opts[:logger])
  228. when Logger; @opts[:logger]
  229. else; Logger.new(STDERR)
  230. end
  231.  
  232. @opts[:queue] = QueueCollection.new(@opts[:path])
  233. - @logger.level = @opts[:log_level] || Logger::ERROR
  234. + @@logger.level = @opts[:log_level] || Logger::ERROR
  235.  
  236. EventMachine.run do
  237. EventMachine.epoll
  238. @@ -80,6 +81,11 @@
  239. end
  240. end
  241.  
  242. + def self.logger
  243. + @@logger
  244. + end
  245. +
  246. +
  247. ##
  248. # Stop accepting new connections and shutdown gracefully.
  249.  
  250. diff -u -r evented-starling/License.txt britted-starling/License.txt
  251. --- evented-starling/License.txt 2008-02-07 11:39:59.000000000 -0800
  252. +++ britted-starling/License.txt 2008-02-08 18:35:04.000000000 -0800
  253. @@ -1,4 +1,4 @@
  254. -Copyright (c) 2007 Blaine Cook, Twitter, Inc.
  255. +Copyright (c) 2007 FIXME full name
  256.  
  257. Permission is hereby granted, free of charge, to any person obtaining
  258. a copy of this software and associated documentation files (the
  259. @@ -17,4 +17,4 @@
  260. NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
  261. LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
  262. OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  263. -WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  264. +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  265. \ No newline at end of file
  266. diff -u -r evented-starling/README.txt britted-starling/README.txt
  267. --- evented-starling/README.txt 2008-02-07 11:39:59.000000000 -0800
  268. +++ britted-starling/README.txt 2008-02-08 18:35:04.000000000 -0800
  269. @@ -29,8 +29,7 @@
  270. = Known Issues
  271.  
  272. * Starling is "slow" as far as messaging systems are concerned. In practice,
  273. - it's fast enough. If you'd like to help make it faster please do. Starting
  274. - points would be to use an event-driven interface, and get rid of threading.
  275. + it's fast enough.
  276.  
  277. = Authors
  278.  
  279. @@ -40,3 +39,5 @@
  280.  
  281. Starling - a light-weight server for reliable distributed message passing.
  282. Copyright 2007 Blaine Cook <blaine@twitter.com>, Twitter Inc.
  283. +
  284. +<<to be completed>>
  285. Only in evented-starling/: speed
  286. diff -u -r evented-starling/test/test_helper.rb britted-starling/test/test_helper.rb
  287. --- evented-starling/test/test_helper.rb 2008-02-07 11:39:59.000000000 -0800
  288. +++ britted-starling/test/test_helper.rb 2008-02-08 18:35:04.000000000 -0800
  289. @@ -1,8 +1,2 @@
  290. require 'test/unit'
  291. -require 'fileutils'
  292. $:.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
  293. -
  294. -lib = File.join(File.dirname(__FILE__), "..")
  295. -tmp = File.join(lib, 'tmp')
  296. -FileUtils.mkdir tmp unless File.exists? tmp
  297. -$:.unshift(File.join(lib, "lib"))
  298. diff -u -r evented-starling/test/test_starling.rb britted-starling/test/test_starling.rb
  299. --- evented-starling/test/test_starling.rb 2008-02-07 11:39:59.000000000 -0800
  300. +++ britted-starling/test/test_starling.rb 2008-02-08 18:35:04.000000000 -0800
  301. @@ -14,19 +14,14 @@
  302. class TestStarling < Test::Unit::TestCase
  303.  
  304. def setup
  305. - @server = StarlingServer::Base.new(:host => '127.0.0.1',
  306. - :port => 22133,
  307. - :path => tmp_path)
  308. + @server, @acceptor = StarlingServer::Base.start(:host => '127.0.0.1',
  309. + :port => 22133,
  310. + :path => tmp_path)
  311.  
  312. @client = MemCache.new('127.0.0.1:22133')
  313. -
  314. - @thread = Thread.new do
  315. - @server.run
  316. - end
  317. end
  318.  
  319. def teardown
  320. - sleep 0.01
  321. @server.stop
  322. @client.reset
  323. FileUtils.rm_f(File.join(tmp_path, '*'))
  324. @@ -96,19 +91,16 @@
  325. end
  326. end
  327.  
  328. - def test_funknown_command_returns_valid_result
  329. - @client.set('blah', 'blah')
  330. + def test_unknown_command_returns_valid_result
  331. response = @client.add('blah', 1)
  332. assert_match 'CLIENT_ERROR', response
  333. - response = @client.get('blah')
  334. - assert_equal 'blah', response
  335. end
  336.  
  337. - def test_disconnecting_and_reconnecting_works
  338. + def test_that_disconnecting_and_reconnecting_works
  339. v = rand(2**32-1)
  340. - @client.set('test_disconnecting_and_reconnecting_works', v)
  341. + @client.set('test_that_disconnecting_and_reconnecting_works', v)
  342. @client.reset
  343. - assert_equal v, @client.get('test_disconnecting_and_reconnecting_works')
  344. + assert_equal v, @client.get('test_that_disconnecting_and_reconnecting_works')
  345. end
  346.  
  347. private
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!