fix domain renames, RT#7083
authorivan <ivan>
Wed, 23 Jun 2010 23:06:04 +0000 (23:06 +0000)
committerivan <ivan>
Wed, 23 Jun 2010 23:06:04 +0000 (23:06 +0000)
FS/FS/part_export/communigate_pro.pm

index edfd4b1..42f562c 100644 (file)
@@ -383,12 +383,16 @@ sub _export_replace_svc_acct {
 sub _export_replace_svc_domain {
   my( $self, $new, $old ) = (shift, shift, shift);
 
+  #let's just do the rename part realtime rather than trying to queue
+  #w/dependencies.  we don't want FS winding up out-of-sync with the wrong
+  #username and a queued job anyway.  right??
   if ( $old->domain ne $new->domain ) {
-    my $error = $self->communigate_pro_queue( $new->svcnum, 'RenameDomain',
-      $old->domain, $new->domain,
-    );
-    return $error if $error;
+    eval { $self->communigate_pro_runcommand(
+             'RenameDomain', $old->domain, $new->domain,
+         ) };
+    return $@ if $@;
   }
+
   my %settings = ();
   $settings{'AccountsLimit'} = $new->max_accounts
     if $old->max_accounts ne $new->max_accounts;