diff --git a/app/views/admin/menu_items/import.html.haml b/app/views/admin/menu_items/import.html.haml index 6df0cdb..9ff1d36 100644 --- a/app/views/admin/menu_items/import.html.haml +++ b/app/views/admin/menu_items/import.html.haml @@ -40,9 +40,14 @@ -@article= Article.new(:enabled => true, :frontpage => true,:end_at => (actu["end_at"] != "0000-00-00 00:00:00" ? actu["end_at"] : "2010-01-01 00:00:00"), :published_at => (actu["start_at"] != "0000-00-00 00:00:00" ? actu["start_at"] : "2010-01-01 00:00:00"), :updated_at => actu["updated_at"], :created_at => actu["created_at"],:title => actu["title"],:description => HTMLEntities.new.decode(actu["description"]) ) - + -begin + -rep = false + -rep = @article.save + -rescue + %h2 erreur + =debug @article - -if @article.save + -if rep -content = "" -begin diff --git a/config/unicorn.rb b/config/unicorn.rb index aba8dd4..f49fd46 100644 --- a/config/unicorn.rb +++ b/config/unicorn.rb @@ -7,4 +7,4 @@ stdout_path "/home/web/#{@rails_app}/shared/unicorn.log" listen "/home/web/#{@rails_app}/shared/unicorn.sock" worker_processes 2 -timeout 600 \ No newline at end of file +timeout 6000 \ No newline at end of file