← Back to branch summary

~ubuntu-branches/ubuntu/trusty/nordugrid-arc/trusty

« back to all changes in this revision

Viewing changes to src/hed/libs/infosys/InfoRegister.cpp

  • Committer: Package Import Robot
  • Author(s): Mattias Ellert
  • Date: 2012-12-13 16:41:31 UTC
  • mfrom: (3.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20121213164131-wii0p2fcv7e3en93
Tags: 2.0.1-1
* 2.0.1 Release
* Drop patches accepted upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/hed/libs/infosys/InfoRegister.cpp
819
819
                    tmp_message += ",";
820
820
                }
821
821
                tmp_message += "{";
 
822
                // Mandatory attributes are here: https://twiki.cern.ch/twiki/bin/view/EMI/EMIRSERDesc
 
823
                // Service_ID
 
824
                tmp_message += "\"Service_ID\":\"";
 
825
                tmp_message += (std::string)node["SrcAdv"]["EPR"]["Address"];
 
826
                tmp_message += "\"";
822
827
                // Service_Name
823
828
                if ( ((std::string)node["SrcAdv"]["Type"]).find("org.nordugrid.execution") != std::string::npos){
824
829
                    tmp_message += "\"Service_Name\":\"ComputingService\",";
837
842
                tmp_message += "\"Service_Type\":\"";
838
843
                tmp_message += (std::string)node["SrcAdv"]["Type"];
839
844
                tmp_message += "\",";
 
845
                //Service_Endpoint_ID
 
846
                tmp_message += "\"Service_Endpoint_ID\":\"";
 
847
                tmp_message += (std::string)node["SrcAdv"]["EPR"]["Address"];
 
848
                tmp_message += "\"";
840
849
                //Service_Endpoint_URL
841
850
                tmp_message += "\"Service_Endpoint_URL\":\"";
842
851
                tmp_message += (std::string)node["SrcAdv"]["EPR"]["Address"];
843
852
                tmp_message += "\"";
 
853
                //Service_Endpoint_Capability
 
854
                tmp_message += "\"Service_Endpoint_Capability\":[\"";
 
855
                tmp_message += "N/A";   //TODO: set capability values
 
856
                tmp_message += "]\"";
 
857
                //Service_Endpoint_Technology
 
858
                tmp_message += "\"Service_Endpoint_Technology\":\"";
 
859
                tmp_message += "N/A";   //TODO: set technology values
 
860
                tmp_message += "\"";
 
861
                //Service_Endpoint_InterfaceName
 
862
                tmp_message += "\"Service_Endpoint_InterfaceName\":\"";
 
863
                tmp_message += "N/A";   //TODO: set InterfaceName values
 
864
                tmp_message += "\"";
 
865
                //Service_Endpoint_InterfaceVersion
 
866
                tmp_message += "\"Service_Endpoint_InterfaceVersion\":\"";
 
867
                tmp_message += "N/A";   //TODO: set InterfaceVersion values
 
868
                tmp_message += "\"";
844
869
                if (already_registered){
845
870
                    // Service_ExpireOn
846
871
                     Period expiration((std::string)node["MetaSrcAdv"]["Expiration"]);
899
924
                } else {
900
925
                    if( http_info.code == 200 )  {
901
926
                        logger_.msg(VERBOSE, "Successful %s to EMIRegistry (%s)", method, id_);
 
927
                        already_registered = true;
902
928
                        delete http_response;
903
929
                        break;
904
930
                    } else {
905
931
                        std::string method2 = already_registered ? "update" : "register";
906
932
                        logger_.msg(VERBOSE, "Failed to %s to EMIRegistry (%s) - %d", method2, id_, http_info.code );
 
933
                        if ( retry_ == 1 ) {
 
934
                            // Already registration need becasue the entry expired (and removed) on the EMIR.
 
935
                            already_registered = false;
 
936
                        }
907
937
                    }
908
938
                }
909
939
                retry_--;
912
942
                sleep(1);
913
943
            }
914
944
        }
915
 
        already_registered = true;
916
945
        // end of the connection with the EMIRegistry
917
946
 
918
947
        // Thread sleeping