This commit was manufactured by cvs2svn to create tag

[bacula/bacula] / bacula / examples / python / SDStartUp.py

diff --git a/bacula/examples/python/SDStartUp.py b/bacula/examples/python/SDStartUp.py
index 2fe0fb27ee80aee9048a461a04caa047207ae408..1f08beda4ca6cd17443106b4f0489b9f755a66e2 100644 (file)
--- a/bacula/examples/python/SDStartUp.py
+++ b/bacula/examples/python/SDStartUp.py
@@ -1,13 +1,12 @@
 #
-# Bacula Python interface script
+# Bacula Python interface script for the Storage Daemon
 #
-
 # You must import both sys and bacula
 import sys, bacula
 
 # This is the list of Bacula daemon events that you
 #  can receive.
-class BaculaEvents:
+class BaculaEvents(object):
   def __init__(self):
      # Called here when a new Bacula Events class is
      #  is created. Normally not used 
@@ -24,24 +23,21 @@ class BaculaEvents:
      job.set_events(events)       # register events desired
      sys.stderr = events          # send error output to Bacula
      sys.stdout = events          # send stdout to Bacula
-     jobid = job.get("JobId")
-     client = job.get("Client")
-     numvols = job.get("NumVols") 
-     job.set(JobReport="Python StartJob: JobId=%d Client=%s NumVols=%d\n" % (jobid,client,numvols))
+     jobid = job.JobId
+     client = job.Client
+     job.JobReport="Python SD JobStart: JobId=%d Client=%s \n" % (jobid,client)
      return 1
 
   # Bacula Job is going to terminate
   def JobEnd(self, job):    
-     jobid = job.get("JobId")
-     client = job.get("Client") 
-     job.set(JobReport="Python EndJob output: JobId=%d Client=%s.\n" % (jobid, client))
-     if (jobid < 2) :
-        startid = job.run("run kernsave")
-        print "Python started new Job: jobid=", startid
-     return 1
+     jobid = job.JobId
+     client = job.Client 
+     job.JobReport="Python SD JobEnd output: JobId=%d Client=%s.\n" % (jobid, client)
+#    print "Python SD JobEnd\n"  
+     
 
   # Called here when the Bacula daemon is going to exit
-  def Exit(self, job):
+  def Exit(self):
       noop = 1
      
 bacula.set_events(BaculaEvents()) # register daemon events desired
@@ -49,44 +45,12 @@ bacula.set_events(BaculaEvents()) # register daemon events desired
 """
   There are the Job events that you can receive.
 """
-class JobEvents:
+class JobEvents(object):
   def __init__(self):
      # Called here when you instantiate the Job. Not
      # normally used
      noop = 1
 
-  def NewVolume(self, job):
-     jobid = job.get("JobId")
-     print "JobId=", jobid
-     client = job.get("Client") 
-     print "Client=" + client
-     numvol = job.get("NumVols");
-     print "NumVols=", numvol
-     job.set(JobReport="Python New Volume set for Job.\n") 
-     job.set(VolumeName="TestA-001")
-     return 1
-
-
   # Pass output back to Bacula
   def write(self, text):
      self.job.write(text)
-
-  # Open file to be backed up. file is the filename
-  def open(self, file):
-     print "Open %s called" % file
-     self.fd = open('m.py', 'rb')
-     jobid = self.job.get("JobId")
-     print "Open: JobId=%d" % jobid
-     print "name=%s" % bacula.name
-
-  # Read file data into Bacula memory buffer (mem)
-  #  return length read. 0 => EOF, -1 => error
-  def read(self, mem):
-     print "Read called\n"
-     len = self.fd.readinto(mem)
-     print "Read %s bytes into mem.\n" % len
-     return len
-
-  # Close file
-  def close(self):
-     self.fd.close()