Corrections based on merge request inputs

notify.py

-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-
 
 
 ##
 ##
@@ -6,10 +6,7 @@
 ##
 ##
 
 
 import platform, logging, os, subprocess, webbrowser, sys
 import platform, logging, os, subprocess, webbrowser, sys
-if sys.hexversion < 0x03000000 and sys.hexversion > 0x02000000:
-    import cPickle as pickle
-else:
-    import pickle
+import cPickle as pickle
 
 
 system = platform.system()
 system = platform.system()
 logger = logging.getLogger()
 logger = logging.getLogger()
@@ -43,32 +40,24 @@ def wall(text):
 
 
 
 
 def accept():
 def accept():
-    import httplib
+    import urllib2, urllib
     if not os.path.isfile("%s/%s" % (get_temp_dir(), file_name)):
     if not os.path.isfile("%s/%s" % (get_temp_dir(), file_name)):
         logger.error("There isn't a request received currently")
         logger.error("There isn't a request received currently")
     else:
     else:
         done = False
         done = False
         # Load the saved url
         # Load the saved url
         url = pickle.load(open("%s/%s" % (get_temp_dir(), file_name), "rb"))
         url = pickle.load(open("%s/%s" % (get_temp_dir(), file_name), "rb"))
-        headers = {"Content-type": "application/x-www-form-urlencoded", "Accept": "text/plain"}
-        # Delete https:// or http:// from beginning
-        if url[:4].lower() == 'http':
-            url = url[url.find("/")+2:]
-        # Try to connect to the specified URL
-        conn = httplib.HTTPConnection(url[:url.find("/")])
-        logger.info("Connection requested to %s" % url[:url.find("/")])
-        # Create the POST http request
-        conn.request("POST", url[url.find("/"):], "", headers)
-        logger.info("Post reques sent to %s" % url)
+        # Fake data to post so we make urllib2 send a POST instead of a GET
+        # do POST request to 
+        req = urllib2.Request(url, "")
+        rsp = urllib2.urlopen(req) 
+        
         # Get the result of the request
         # Get the result of the request
-        response = conn.getresponse()
-        success = response.getheader('renewal')
-        if success is None:
-            success = ''
-        if success.lower() == 'success' or response.status == httplib.OK:
+        success = rsp.info()['renewal']
+        if success is not None or rsp.getcode() == 200:
             logger.info("Successfull renew, 200 - OK")
             logger.info("Successfull renew, 200 - OK")
             done = True
             done = True
-        elif response.status == httplib.FOUND:
+        elif rsp.getcode() == 302:
             logger.info("Response is 302 - FOUND")
             logger.info("Response is 302 - FOUND")
             done = True
             done = True
         else:
         else:

vm_renewal

-#!/usr/bin/python
+#!/usr/bin/env python
 
 
 import notify
 import notify
 
 
 if __name__ == '__main__':
 if __name__ == '__main__':
     try:
     try:
         notify.accept()
         notify.accept()
-    finally:
-        pass
+    except:
+        notify.wall("There was an unknown error while trying to renew this vm, please do it manually!")
\ No newline at end of file

[Őry Máté]

you could simply print this

[Csók Tamás]

I could, but the main idea was to spam the user with information about the incoming suspension. Shouldn't a renew error be spammed too? Considering the other errors are all wall-ed too.

[Őry Máté]

They will call this command in a terminal, they will see its output as well.

[Csók Tamás]

Shall I change all the rest of the accept method texts as well then?

[Őry Máté]

please

[Csók Tamás]

done :)