Navigation

Changeset 204

Timestamp:

11/14/07 23:26:06 (1 year ago)

Author:

gethema..@gmail.com

Message:

fixed bug with reading data back

Files:

r187	r204
4	4	# when method returns nil it probably means that client diconnected
5	5	def read_data(t_sock)
6		~~sock_data = nil~~
7	6	begin
8		while(sock_data = t_sock.read_nonblock(1023)); end
	7	while(sock_data << t_sock.read_nonblock(1023)); end
	8	p sock_data
9	9	rescue Errno::EAGAIN
10	10	return sock_data
…	…
57	57	length_str = dump_length.rjust(9,'0')
58	58	final_data = length_str + object_dump
	59
	60	# total_length = final_data.length
	61	# loop do
	62	# begin
	63	# written_length = p_sock.write_nonblock(final_data)
	64	# rescue Errno::EAGAIN
	65	# break
	66	# end
	67	# break if written_length >= total_length
	68	# final_data = final_data[written_length..-1]
	69	# break if final_data.empty?
	70	# total_length = final_data.length
	71	# end
	72
59	73	begin
60	74	p_sock.write_nonblock(final_data)

r196	r204
52	52	end
53	53
54		def read_~~data~~
55		sock_data = ~~nil~~
	54	def read_object
	55	sock_data = ""
56	56	begin
57		while(sock_data = @connection.read_nonblock(1023)); end
	57	while(sock_data << @connection.read_nonblock(1023)); end
58	58	rescue Errno::EAGAIN
59	59	@tokenizer.extract(sock_data) { \|b_data\| return b_data }
…	…
72	72	ret_val = select([@connection],nil,nil,3)
73	73	return nil unless ret_val
74		raw_response = read_~~data~~()
	74	raw_response = read_object()
75	75	master_response = Marshal.load(raw_response)
76	76	return master_response
…	…
89	89	dump_object(p_data,@connection)
90	90	begin
91		ret_val = select([@connection],nil,nil,3)
	91	ret_val = select([@connection],nil,nil,10)
92	92	return nil unless ret_val
93		raw_response = read_data()
	93
	94	raw_response = read_object()
94	95	master_response = Marshal.load(raw_response)
95	96	return master_response[:data]

r201	r204
11	11	@cron_expr = expr
12	12	self.sec, self.min, self.hour, self.day, self.month, self.wday, self.year = @cron_expr.split(' ')
13		puts inspect
	13	# puts inspect
14	14	end
15	15