smsc_manager 0.4.8 → 0.5.1

data/Manifest.txt

@@ -8,6 +8,7 @@ bin/smsc_config.rb
 bin/smsc_print_config.rb
 bin/send_sms_post.rb
 bin/send_sms.rb
+bin/internal_sms_load_test.rb
 bin/send_sms_load_test.rb
 bin/sms_print_xml.rb
 bin/send_sms_http.rb

data/bin/internal_sms_load_test.rb

@@ -0,0 +1,124 @@
+#!/usr/bin/env ruby
+require 'optparse'
+def usage
+    puts "Usage: internal_sms_load_test.rb -u user -m msisdn -s source -t text  -c count -r count" 
+   puts "to test how long to send c sms"
+   exit
+end
+def parse_options(params)
+   opts = OptionParser.new
+   puts "argv are #{params}"
+   #params_split = params.split(' ')
+   #puts "paramsp is #{paramsp}"
+   user_flag=msisdn_flag=source_flag=text_flag=count_flag=true
+   temp_hash = {}
+   opts.on("-u","--user VAL", String) {|val|  temp_hash[:user ] = val
+                                           puts "user is #{val}"
+                                           user_flag=false }
+    opts.on("-h","--host VAL", String) {|val|  temp_hash[:host ] = val
+                                                puts "host is #{val}"
+                                                   }                                       
+                                           
+   opts.on("-c","--count VAL", Integer) {|val|  temp_hash[:count ] = val
+                                     puts "count is #{val}"
+                                     count_flag=false }
+   opts.on("-m","--msisdn VAL", String) {|val|  temp_hash[:msisdn ] = val
+                                          puts "msiddn is #{val}"
+                                          msisdn_flag=false }
+          opts.on("-r","--repeat VAL", Integer) {|val|  temp_hash[:repeat ] = val
+                                                puts "repease is #{val}"
+                                                  msisdn_flag=false }                                          
+                                          
+  opts.on("-s","--source VAL", String) {|val|  temp_hash[:source ] = val
+                                              puts "source is #{val}"
+                                              source_flag=false }
+   opts.on("-t","--text VAL", String) {|val|  temp_hash[:text ] = val
+                                          puts "text is #{val}"
+                                          text_flag=false }
+   #opts.on("-d","--database VAL", String) {|val|  temp_hash[:db ] = val }
+   #opts.on("-p","--password VAL", String) {|val|  temp_hash[:password ] = val }
+   #opts.on("-u","--user VAL", String) {|val|  temp_hash[:user ] = val }
+   #puts " in test commander option parse #{port} #{url}"
+   opts.parse(params)
+   # puts " in HTTP #{hostname} port #{port} url: #{url}"
+   usage if user_flag or msisdn_flag or source_flag or text_flag or count_flag
+   return temp_hash
+ end
+ arg_hash=parse_options(ARGV)
+require 'pp'
+
+require 'rubygems'
+gem 'smsc_manager'
+require 'smsc_manager'
+def send_group(arg_hash,sms_sender)
+  user=arg_hash[:user]
+   destination=arg_hash[:msisdn]
+   source=arg_hash[:source]
+   text=arg_hash[:text]
+   count=arg_hash[:count]
+    receipt_count=count
+   1.upto(count) { |c| 
+     puts "sent #{c} messages" if c % 100 == 0   
+     final_text = "count: #{c}: #{text} "
+     s=SmscManager::Sms.new(final_text,destination,source)
+     sms_sender.send_topic_sms_receipt(s) { |m| receipt_count-=1
+                                              #  puts "receipt: #{receipt_count}" 
+                                                }
+      sleep(1) if c % 100 == 0   
+      Thread.pass
+    }
+  
+   # sms_sender.close_topic
+        begin
+       Timeout::timeout(count*0.5) {
+            while true  
+               puts "sent #{count} waiting for #{receipt_count} receipts"
+               exit(0) if receipt_count==0   
+               sleep(1)
+               end  }
+         rescue SystemExit
+         
+         rescue Exception => e
+          puts "exception #{e.message} class: #{e.class}"
+          puts  "#{e.backtrace}"
+          raise e 
+        
+         end
+         receipt_count
+end
+    puts "Finding sms topic to use:"
+    begin
+      sms_sender=SmscManager::SmsSendTopic.new(arg_hash)    
+      # sms_sender.setup_auto_close   #only call this once  # servers onlycall cloase
+   rescue Exception => e
+      puts "exception found #{e.backtrace}" 
+   end  
+     
+     repeat= arg_hash[:repeat]
+     count= arg_hash[:count]
+     start=Time.now
+     puts "Time now: #{start}"
+     no_receipt_count=0
+     1.upto(repeat) { |r|
+       no_receipt_count+=send_group(arg_hash,sms_sender)
+       sleep(1)
+       
+       }
+             
+        diff = Time.now - start
+        no_prob = count*repeat - no_receipt_count
+    	puts "#{Time.now} Sent #{count*repeat} in #{diff} seconds with #{no_receipt_count} problems";
+    	puts " Average message per second is: #{no_prob/diff}"
+    	
+    	
+       
+    	exit(0)
+    	
+    # puts "Sending user: #{user} destination: #{destination}  text: #{text}"
+   #  res= smsc.send(sms)
+   #   puts "Response code: #{res.response} body: #{res.response_body}"  
+   #  puts "Response code: #{res}"  if res.kind_of? String
+   #  puts "pretty print response:"
+  #   pp res
+    # puts "Response code: #{res.} body: #{res.code}"  if res.kind_of? Net::Http
+    

data/bin/send_sms.rb

@@ -56,6 +56,7 @@ require 'smsc_manager'
      text=arg_hash[:text]
      sms_sender.send_sms(text,destination,source)
      puts "Sending user: #{user} destination: #{destination}  text: #{text}"
+     #sms_sender.setup_auto_close
    #  res= smsc.send(sms)
    #   puts "Response code: #{res.response} body: #{res.response_body}"  
    #  puts "Response code: #{res}"  if res.kind_of? String

data/bin/send_sms_load_test.rb

@@ -60,14 +60,40 @@ require 'smsc_manager'
      count=arg_hash[:count]
      start=Time.now
      puts "Time now: #{start}"
+     receipt_count=count
      1.upto(count) { |c| 
        puts "sent #{c} messages" if c % 100 == 0   
        final_text = "count: #{c}: #{text} "
-       sms_sender.send_sms(final_text,destination,source)
+       s=SmscManager::Sms.new(final_text,destination,source)
+       sms_sender.send_topic_sms_receipt(s) { |m| receipt_count-=1
+                                                #  puts "receipt: #{receipt_count}" 
+                                                  }
+        sleep(1) if c % 100 == 0   
+        Thread.pass
       }
       diff = Time.now - start
-      sms_sender.close_topic
+     # sms_sender.close_topic
+          begin
+         Timeout::timeout(count*0.5) {
+              while true  
+                 puts "sent #{count} waiting for #{receipt_count} receipts"
+                 exit(0) if receipt_count==0   
+                 sleep(1)
+                 end  }
+           rescue SystemExit
+           
+           rescue Exception => e
+            puts "exception #{e.message} class: #{e.class}"
+            puts  "no receipt"
+         #   raise "timeout" 
+           ensure
+            sms_sender.setup_auto_close
+           end   
+             
+      
     	puts "#{Time.now} Sent #{count} in #{diff} seconds";
+    	exit(0)
+    	
     # puts "Sending user: #{user} destination: #{destination}  text: #{text}"
    #  res= smsc.send(sms)
    #   puts "Response code: #{res.response} body: #{res.response_body}"  

data/bin/sms_om_server.rb

@@ -12,7 +12,7 @@ require 'smsc_manager'
     puts "Starting Operational Measurement (OM) server:"
   #  begin
   # can add additional options to change host/port etc
-      sms_listener=SmscManager::SmsStatisticsListener.new({:topic => '/topic/sms'}).run
+      sms_listener=SmscManager::SmsStatisticsListener.new({:topic => '/topic/sms', :thread_count => '5'}).run
     #  sms_listener.join
    # rescue Exception => e
       puts "exception found #{e.backtrace}" 

data/bin/sms_topic_server.rb

@@ -11,7 +11,7 @@ require 'smsc_manager'
 
     puts "Starting topic server:"
   #  begin
-      SmscManager::SmscListener.new({:topic => '/topic/sms'}).run
+      SmscManager::SmscListener.new({:topic => '/topic/sms', :thread_count => '14'}).run
    #   sms_listener.join
    # rescue Exception => e
       puts "exception found #{e.backtrace}" 

data/lib/smsc_manager/broadcast_topic.rb

@@ -45,20 +45,21 @@ class BroadcastTopic
               # puts "  dst is #{dst}" 
                }
     puts "populate topic sent #{self.sent}"
-    self.sms_sender.close_topic
+    sleep(1)
+    self.sms_sender.disconnect_stomp
   end
   def send_it(txt,dst)
   #  puts "hello from send it"
     begin
      sms=SmscManager::Sms.new(txt,dst,self.source)
-     self.sms_sender.send_topic_sms(sms)
+     self.sms_sender.send_topic_sms_receipt(sms)  {|r|  # puts "in receipt handler #{r.to_s}" 
+                                                        self.sent+=1 }
      self.attempts+=1
-     self.sent+=1
      rescue  Exception => e
        self.sent-=1
        puts "bad values dst: #{dst} txt: #{txt} msg: #{e.message}"
      end
-     self.sms_sender.close_topic
+    # self.sms_sender.close_topic
    end
   end
 end

data/lib/smsc_manager/sms_send_topic.rb

@@ -7,7 +7,7 @@ require 'stomp_message'
 # This sends the sms to a activemq topic
 module SmscManager
 class SmsSendTopic < StompMessage::StompSendTopic
-  attr_accessor :conn
+  
   #need to define topic, host properly
   @@TOPIC='/topic/sms'
   # must be defined as method in sms_listener
@@ -15,9 +15,10 @@ class SmsSendTopic < StompMessage::StompSendTopic
  def initialize(options={})
    # set up variables using hash
     options[:topic] =   options[:topic]==nil ? @@TOPIC : options[:topic]
-    puts "#{self.class}: host is: #{host} port is #{port} topic is #{options[:topic]}"
+   
     super(options)
-    puts "finished initializing"
+    
+    #puts "finished initializing"
   end
  # def initialize()
   #    self.conn = Stomp::Connection.open '', '', 'localhost', 61613, false 
@@ -33,9 +34,19 @@ class SmsSendTopic < StompMessage::StompSendTopic
         # msgbody=sms.to_xml
          m=StompMessage::Message.new(@@STOMP_SMS_MESSAGE, sms.to_xml)
       #   puts "message body is #{msgbody}"
-         headers = {:msisdn =>"#{sms.destination}"}
+        # headers = {:msisdn =>"#{sms.destination}"}
+         headers = {}
          send_topic(m, headers)     
   end #send_sms
+  def send_topic_sms_receipt(sms, &r_block)
+         #sms=SmscManager::Sms.new(text,destination,source)
+        # msgbody=sms.to_xml
+         m=StompMessage::Message.new(@@STOMP_SMS_MESSAGE, sms.to_xml)
+      #   puts "message body is #{msgbody}"
+        # headers = {:msisdn =>"#{sms.destination}"}
+          headers = {}
+         send_topic(m, headers, &r_block)     
+  end #send_sms
   # simple script to show xml message
   def self.create_stomp_message(txt,dest,src)
        sms=SmscManager::Sms.new(txt,dest,src)

data/lib/smsc_manager/smsc_listener.rb

@@ -17,23 +17,23 @@ class SmscListener < StompMessage::StompServer
     self.smsc=SmscManager::SmscConnection.factory
     puts "finished initializing"
   end
-  def send_reply(headers,msg)
-     msisdn = headers['msisdn']
-     reply_topic=headers['reply-to']
-     puts "headers:  #{headers['msisdn']} reply topic #{headers['reply-to']}"
-         internal_conn =  Stomp::Connection.open '', '', self.host, self.port, false 
-         internal_conn.subscribe reply_topic, { :ack =>"auto" }
+ # def send_reply(headers,msg)
+   #  msisdn = headers['msisdn']
+   #  reply_topic=headers['reply-to']
+ #    puts "headers:  #{headers['msisdn']} reply topic #{headers['reply-to']}"
+  #       internal_conn =  Stomp::Connection.open '', '', self.host, self.port, false 
+    #     internal_conn.subscribe reply_topic, { :ack =>"auto" }
       #   m=StompMessage::Message.new('stomp_REPLY', msg_body)
-         internal_conn.send(reply_topic, msg.to_xml, {'persistent'=>'false',  'msisdn' => "#{msisdn}" }) 
-         internal_conn.unsubscribe reply_topic
-   end
+   #      internal_conn.send(reply_topic, msg.to_xml, {'persistent'=>'false',  'msisdn' => "#{msisdn}" }) 
+   #      internal_conn.unsubscribe reply_topic
+ #  end
   # name is message command
   def stomp_SMS(msg, stomp_msg)
      sms=SmscManager::Sms.load_xml(msg.body)
       puts "sending sms #{msg.body}" if @debug
      res= self.smsc.send(sms)
      
-     sleep(SLEEP_TIME)  #only 5 messages per second max
+   #  sleep(SLEEP_TIME)  #only 5 messages per second max
   end
   
 end # smsc listener

data/lib/smsc_manager/version.rb

@@ -1,8 +1,8 @@
 module SmscManager #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 4
-    TINY  = 8
+    MINOR = 5
+    TINY  = 1
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: smsc_manager
 version: !ruby/object:Gem::Version 
-  version: 0.4.8
-date: 2007-10-03 00:00:00 +08:00
+  version: 0.5.1
+date: 2007-10-08 00:00:00 +08:00
 summary: connection to smsc via http using kannel
 require_paths: 
 - lib
@@ -39,6 +39,7 @@ files:
 - bin/smsc_print_config.rb
 - bin/send_sms_post.rb
 - bin/send_sms.rb
+- bin/internal_sms_load_test.rb
 - bin/send_sms_load_test.rb
 - bin/sms_print_xml.rb
 - bin/send_sms_http.rb
@@ -73,6 +74,7 @@ executables:
 - smsc_print_config.rb
 - send_sms_post.rb
 - send_sms.rb
+- internal_sms_load_test.rb
 - send_sms_load_test.rb
 - sms_print_xml.rb
 - send_sms_http.rb